From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sun, 29 May 2022 23:01:46 +0000 (+0200)
Subject: Add patch conflict workflow
X-Git-Tag: v4.6~63^2
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=0095948d8d7a04d8213898cedea19a359c435217;p=nnn.git

Add patch conflict workflow
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d535c3d..9394e0c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,3 +35,34 @@ jobs:
           make
           make clean
           clang-tidy src/* -- -I/usr/include
+  macOS-patches:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile patches with gcc
+        env:
+          CC: gcc
+        run: |
+          export CFLAGS="$CFLAGS -Werror"
+          make clean
+          echo "########## O_NAMEFIRST=1 ##########"
+          make O_NAMEFIRST=1
+          make clean
+          echo "########## O_GITSTATUS=1 ##########"
+          make O_GITSTATUS=1
+          make clean
+          echo "########## O_RESTOREPREVIEW=1 ##########"
+          make O_RESTOREPREVIEW=1
+          make clean
+          echo "########## O_NAMEFIRST=1 O_GITSTATUS=1 ##########"
+          make O_NAMEFIRST=1 O_GITSTATUS=1
+          make clean
+          echo "########## O_NAMEFIRST=1 O_RESTOREPREVIEW=1 ##########"
+          make O_NAMEFIRST=1 O_RESTOREPREVIEW=1
+          make clean
+          echo "########## O_GITSTATUS=1 O_RESTOREPREVIEW=1 ##########"
+          make O_GITSTATUS=1 O_RESTOREPREVIEW=1
+          make clean
+          echo "########## O_NAMEFIRST=1 O_GITSTATUS=1 O_RESTOREPREVIEW=1 ##########"
+          make O_NAMEFIRST=1 O_GITSTATUS=1 O_RESTOREPREVIEW=1
+          make clean