colourpicker

Commit: 602db0d780a50dfe529c8722061c8b60b8deb4d7
Parent: f52e0fb62cd5793d6c92b79f03b3d52e0b1d7a1c
Author: Randy Palamar
Date:   Mon,  5 Aug 2024 15:26:07 -0600

ci: fix git config

Diffstat:
M
.github/workflows/build.yml
 | 
13
+++++++++++--
M
build.sh
 | 
2
+-

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,10 +14,14 @@ jobs:
     env:
       CC: "${{ matrix.cc }}"
     steps:
-      - uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           sudo apt-get install libxkbcommon-dev xorg-dev libwayland-dev ninja-build
+      - name: Configure Git
+        run: |
+          git config --global user.email "fu@githubci.com"
+          git config --global user.name "F U"
+      - uses: actions/checkout@v4
       - name: Build
         run: ./build.sh
 
@@ -35,7 +39,6 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{matrix.sys}}
@@ -43,5 +46,11 @@ jobs:
           install: git mingw-w64-${{matrix.env}}-${{matrix.cc}}
           pacboy: ninja:p cmake:p
 
+      - name: Configure Git
+        run: |
+          git config --global user.email "fu@githubci.com"
+          git config --global user.name "F U"
+
+      - uses: actions/checkout@v4
       - name: Build
         run: ./build.sh
diff --git a/build.sh b/build.sh
@@ -18,7 +18,7 @@ if [ "$system_raylib" ]; then
 else
 	if  [ ! -f external/lib/libraylib.a ]; then
 		git submodule update --init --checkout --depth=1 external/raylib
-		git -C external/raylib apply --whitespace=nowarn "$PWD"/external/*.patch
+		git -C external/raylib am --keep-non-patch --whitespace=nowarn "$PWD"/external/*.patch
 		cmake --install-prefix="${PWD}/external" \
 		      -G "Ninja" -B external/raylib/build -S external/raylib \
 		      -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE="Release" \