Updated yml.

dpldgr · Nov 8, 2024 · 0f8ce30 · 0f8ce30
1 parent 6c07586
commit 0f8ce30
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/.github/workflows/game_ply_limit.yml b/.github/workflows/game_ply_limit.yml
@@ -1,9 +1,10 @@
 name: branch(game_ply_limit)
 
 env:
-  EXE_NAME_STD: fairy-stockfish
-  EXE_NAME_LB:  fairy-stockfish-largeboards
-  EXE_NAME_ALL: fairy-stockfish-largeboards-all
+  EXE_NAME:        fairy-stockfish
+  EXE_NAME_ALL:    fairy-stockfish-all
+  EXE_NAME_LB:     fairy-stockfish-largeboards
+  EXE_NAME_LB_ALL: fairy-stockfish-largeboards-all
 
 on:
   push:
@@ -37,34 +38,44 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Check compiler
-        run: ${{ matrix.COMPCXX }} -v
+        run: ${{ matrix.compcxx }} -v
 
       - name: make
         if: ${{ matrix.build_std == true }}
-        run: cd src && make clean && make -j build COMP=${{ matrix.COMP }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME_STD }}_${{ matrix.arch }}${{ matrix.EXT }} && strip ${{ env.EXE_NAME_STD }}_${{ matrix.arch }}${{ matrix.EXT }}
+        run: cd src && make clean && make -j build COMP=${{ matrix.comp }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME }}_${{ matrix.arch }}${{ matrix.ext }} && strip ${{ env.EXE_NAME }}_${{ matrix.arch }}${{ matrix.ext }}
 
       - uses: actions/upload-artifact@v4
         if: ${{ matrix.build_std == true }}
         with:
-          name: ${{ matrix.NAME }} ${{ env.EXE_NAME_STD }}_${{ matrix.arch }}
-          path: src/${{ env.EXE_NAME_STD }}_${{ matrix.arch }}${{ matrix.EXT }}
+          name: ${{ matrix.os_name }} ${{ env.EXE_NAME }}_${{ matrix.arch }}
+          path: src/${{ env.EXE_NAME }}_${{ matrix.arch }}${{ matrix.ext }}
 
       - name: make largeboards
         if: ${{ matrix.build_lb == true }}
-        run: cd src && make clean && make -j build COMP=${{ matrix.COMP }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME_LB }}_${{ matrix.arch }}${{ matrix.EXT }} largeboards=yes && strip ${{ env.EXE_NAME_LB }}_${{ matrix.arch }}${{ matrix.EXT }}
+        run: cd src && make clean && make -j build COMP=${{ matrix.comp }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME_LB }}_${{ matrix.arch }}${{ matrix.ext }} largeboards=yes && strip ${{ env.EXE_NAME_LB }}_${{ matrix.arch }}${{ matrix.ext }}
 
       - uses: actions/upload-artifact@v4
         if: ${{ matrix.build_lb == true }}
         with:
-          name: ${{ matrix.NAME }} ${{ env.EXE_NAME_LB }}_${{ matrix.arch }}
-          path: src/${{ env.EXE_NAME_LB }}_${{ matrix.arch }}${{ matrix.EXT }}
+          name: ${{ matrix.os_name }} ${{ env.EXE_NAME_LB }}_${{ matrix.arch }}
+          path: src/${{ env.EXE_NAME_LB }}_${{ matrix.arch }}${{ matrix.ext }}
 
       - name: make all
         if: ${{ matrix.build_all == true }}
-        run: cd src && make clean && make -j build COMP=${{ matrix.COMP }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}${{ matrix.EXT }} largeboards=yes all=yes && strip ${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}${{ matrix.EXT }}
+        run: cd src && make clean && make -j build COMP=${{ matrix.comp }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}${{ matrix.ext }} all=yes && strip ${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}${{ matrix.ext }}
 
       - uses: actions/upload-artifact@v4
         if: ${{ matrix.build_all == true }}
         with:
-          name: ${{ matrix.NAME }} ${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}
-          path: src/${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}${{ matrix.EXT }}
+          name: ${{ matrix.os_name }} ${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}
+          path: src/${{ env.EXE_NAME_ALL }}_${{ matrix.arch }}${{ matrix.ext }}
+
+      - name: make largeboards all
+        if: ${{ matrix.build_lb_all == true }}
+        run: cd src && make clean && make -j build COMP=${{ matrix.comp }} ARCH=${{ matrix.arch }} EXE=${{ env.EXE_NAME_LB_ALL }}_${{ matrix.arch }}${{ matrix.ext }} largeboards=yes all=yes && strip ${{ env.EXE_NAME_LB_ALL }}_${{ matrix.arch }}${{ matrix.ext }}
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ matrix.build_lb_all == true }}
+        with:
+          name: ${{ matrix.os_name }} ${{ env.EXE_NAME_LB_ALL }}_${{ matrix.arch }}
+          path: src/${{ env.EXE_NAME_LB_ALL }}_${{ matrix.arch }}${{ matrix.ext }}
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
@@ -1,14 +1,14 @@
 {
   "include": [
-    {"NAME": "windows",  "arch": "x86-64",        "run_os": "windows-2022", "COMPCXX": "g++",     "COMP": "mingw", "build_std": true, "build_lb": true, "build_all": true,  "EXT": ".exe"},
-    {"NAME": "windows",  "arch": "x86-64-bmi2",   "run_os": "windows-2022", "COMPCXX": "g++",     "COMP": "mingw", "build_std": true, "build_lb": true, "build_all": false, "EXT": ".exe"},
-    {"NAME": "windows",  "arch": "x86-64-modern", "run_os": "windows-2022", "COMPCXX": "g++",     "COMP": "mingw", "build_std": true, "build_lb": true, "build_all": false, "EXT": ".exe"},
-    {"NAME": "ubuntu",   "arch": "x86-64",        "run_os": "ubuntu-20.04", "COMPCXX": "g++",     "COMP": "gcc",   "build_std": true, "build_lb": true, "build_all": true},
-    {"NAME": "ubuntu",   "arch": "x86-64-bmi2",   "run_os": "ubuntu-20.04", "COMPCXX": "g++",     "COMP": "gcc",   "build_std": true, "build_lb": true, "build_all": false},
-    {"NAME": "ubuntu",   "arch": "x86-64-modern", "run_os": "ubuntu-20.04", "COMPCXX": "g++",     "COMP": "gcc",   "build_std": true, "build_lb": true, "build_all": false},
-    {"NAME": "macos",    "arch": "x86-64",        "run_os": "macos-13",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": true},
-    {"NAME": "macos",    "arch": "x86-64-bmi2",   "run_os": "macos-13",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false},
-    {"NAME": "macos",    "arch": "x86-64-modern", "run_os": "macos-13",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false},
-    {"NAME": "macos-m1", "arch": "apple-silicon", "run_os": "macos-14",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false}
+    {"os_name": "windows",  "arch": "x86-64",        "run_os": "windows-2022", "COMPCXX": "g++",     "COMP": "mingw", "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false, "EXT": ".exe"},
+    {"os_name": "windows",  "arch": "x86-64-bmi2",   "run_os": "windows-2022", "COMPCXX": "g++",     "COMP": "mingw", "build_std": true, "build_lb": true, "build_all":  true, "build_lb_all":  true, "EXT": ".exe"},
+    {"os_name": "windows",  "arch": "x86-64-modern", "run_os": "windows-2022", "COMPCXX": "g++",     "COMP": "mingw", "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false, "EXT": ".exe"},
+    {"os_name": "ubuntu",   "arch": "x86-64",        "run_os": "ubuntu-20.04", "COMPCXX": "g++",     "COMP": "gcc",   "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false},
+    {"os_name": "ubuntu",   "arch": "x86-64-bmi2",   "run_os": "ubuntu-20.04", "COMPCXX": "g++",     "COMP": "gcc",   "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false},
+    {"os_name": "ubuntu",   "arch": "x86-64-modern", "run_os": "ubuntu-20.04", "COMPCXX": "g++",     "COMP": "gcc",   "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false},
+    {"os_name": "macos",    "arch": "x86-64",        "run_os": "macos-13",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false},
+    {"os_name": "macos",    "arch": "x86-64-bmi2",   "run_os": "macos-13",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false},
+    {"os_name": "macos",    "arch": "x86-64-modern", "run_os": "macos-13",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false},
+    {"os_name": "macos-m1", "arch": "apple-silicon", "run_os": "macos-14",     "COMPCXX": "clang++", "COMP": "clang", "build_std": true, "build_lb": true, "build_all": false, "build_lb_all": false}
   ]
 }