]> git.sesse.net Git - stockfish/commitdiff
GitHub Actions: install NDK once and clean up yaml
authorppigazzini <pasquale.pigazzini@gmail.com>
Sun, 11 Dec 2022 11:06:22 +0000 (12:06 +0100)
committerJoost VandeVondele <Joost.VandeVondele@gmail.com>
Mon, 12 Dec 2022 07:17:52 +0000 (08:17 +0100)
Use Ubuntu 22.04 as runner for NDK to avoid a qemu bug with `profile-build`

closes https://github.com/official-stockfish/Stockfish/pull/4280

No functional change

.github/workflows/stockfish_arm_binaries.yml
.github/workflows/stockfish_binaries.yml
.github/workflows/stockfish_compile_test.yml
.github/workflows/stockfish_sanitizers.yml
.github/workflows/stockfish_test.yml

index ea738cef66fa46e4ed72200d41821f6b9d76b43b..a1b3cdab0ea086d6dfe236534a6c8bad08bc4efd 100644 (file)
@@ -15,22 +15,18 @@ jobs:
     strategy:
       matrix:
         config:
-          - {
-              name: "Android NDK aarch64",
-              os: ubuntu-20.04,
-              compiler: aarch64-linux-android21-clang++,
-              emu: qemu-aarch64,
-              comp: ndk,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Android NDK arm",
-              os: ubuntu-20.04,
-              compiler: armv7a-linux-androideabi21-clang++,
-              emu: qemu-arm,
-              comp: ndk,
-              shell: 'bash {0}'
-            }
+          - name: Android NDK aarch64
+            os: ubuntu-22.04
+            compiler: aarch64-linux-android21-clang++
+            emu: qemu-aarch64
+            comp: ndk
+            shell: bash {0}
+          - name: Android NDK arm
+            os: ubuntu-22.04
+            compiler: armv7a-linux-androideabi21-clang++
+            emu: qemu-arm
+            comp: ndk
+            shell: bash {0}
         binaries:
           - armv8
           - armv7
@@ -57,18 +53,27 @@ jobs:
           sudo apt update
           sudo apt install qemu-user
 
+      - name: Install NDK
+        if: runner.os == 'Linux'
+        run: |
+          if [ $COMP == ndk ]; then
+            NDKV="21.4.7075529"
+            ANDROID_ROOT=/usr/local/lib/android
+            ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
+            SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
+            echo "y" | $SDKMANAGER "ndk;$NDKV"
+            ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$NDKV
+            ANDROID_NDK_BIN=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin
+            echo "ANDROID_NDK_BIN=$ANDROID_NDK_BIN" >> $GITHUB_ENV
+          fi
+
       - name: Download the used network from the fishtest framework
         run: make net
 
       - name: Check compiler
         run: |
           if [ $COMP == ndk ]; then
-            ANDROID_ROOT=/usr/local/lib/android
-            ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
-            SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
-            echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-            ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-            export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+            export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
           fi
           $COMPILER -v
 
@@ -83,12 +88,7 @@ jobs:
       - name: Compile ${{ matrix.binaries }} build
         run: |
           if [ $COMP == ndk ]; then
-            ANDROID_ROOT=/usr/local/lib/android
-            ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
-            SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
-            echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-            ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-            export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+            export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
             export LDFLAGS="-static -Wno-unused-command-line-argument"
           fi
           make clean
index 575352966874e55dbe47b9d166d06640211c61d7..06b13a9e095dae997a3655ce8980d75fef93302f 100644 (file)
@@ -14,30 +14,24 @@ jobs:
     strategy:
       matrix:
         config:
-          - {
-              name: "Ubuntu 20.04 GCC",
-              os: ubuntu-20.04,
-              compiler: g++,
-              comp: gcc,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "MacOS 12 Apple Clang",
-              os: macos-12,
-              compiler: clang++,
-              comp: clang,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Windows 2022 Mingw-w64 GCC x86_64",
-              os: windows-2022,
-              compiler: g++,
-              comp: mingw,
-              msys_sys: 'mingw64',
-              msys_env: 'x86_64-gcc',
-              shell: 'msys2 {0}',
-              ext: .exe
-            }
+          - name: Ubuntu 20.04 GCC
+            os: ubuntu-20.04
+            compiler: g++
+            comp: gcc
+            shell: bash {0}
+          - name: MacOS 12 Apple Clang
+            os: macos-12
+            compiler: clang++
+            comp: clang
+            shell: bash {0}
+          - name: Windows 2022 Mingw-w64 GCC x86_64
+            os: windows-2022
+            compiler: g++
+            comp: mingw
+            msys_sys: mingw64
+            msys_env: x86_64-gcc
+            shell: msys2 {0}
+            ext: .exe
         binaries:
           - x86-64
           - x86-64-modern
index eeb4229cbd37d8792868bb5c361b3b43b2851309..c7280a85537301d12a3f64e81645dc9a4b926b78 100644 (file)
@@ -11,52 +11,40 @@ jobs:
     strategy:
       matrix:
         config:
-          - {
-              name: "Ubuntu 20.04 GCC",
-              os: ubuntu-20.04,
-              compiler: g++,
-              comp: gcc,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Ubuntu 20.04 Clang",
-              os: ubuntu-20.04,
-              compiler: clang++,
-              comp: clang,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "MacOS 12 Apple Clang",
-              os: macos-12,
-              compiler: clang++,
-              comp: clang,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "MacOS 12 GCC 11",
-              os: macos-12,
-              compiler: g++-11,
-              comp: gcc,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Windows 2022 Mingw-w64 GCC x86_64",
-              os: windows-2022,
-              compiler: g++,
-              comp: mingw,
-              msys_sys: 'mingw64',
-              msys_env: 'x86_64-gcc',
-              shell: 'msys2 {0}'
-            }
-          - {
-              name: "Windows 2022 Mingw-w64 Clang x86_64",
-              os: windows-2022,
-              compiler: clang++,
-              comp: clang,
-              msys_sys: 'clang64',
-              msys_env: 'clang-x86_64-clang',
-              shell: 'msys2 {0}'
-            }
+          - name: Ubuntu 20.04 GCC
+            os: ubuntu-20.04
+            compiler: g++
+            comp: gcc
+            shell: bash {0}
+          - name: Ubuntu 20.04 Clang
+            os: ubuntu-20.04
+            compiler: clang++
+            comp: clang
+            shell: bash {0}
+          - name: MacOS 12 Apple Clang
+            os: macos-12
+            compiler: clang++
+            comp: clang
+            shell: bash {0}
+          - name: MacOS 12 GCC 11
+            os: macos-12
+            compiler: g++-11
+            comp: gcc
+            shell: bash {0}
+          - name: Windows 2022 Mingw-w64 GCC x86_64
+            os: windows-2022
+            compiler: g++
+            comp: mingw
+            msys_sys: mingw64
+            msys_env: x86_64-gcc
+            shell: msys2 {0}
+          - name: Windows 2022 Mingw-w64 Clang x86_64
+            os: windows-2022
+            compiler: clang++
+            comp: clang
+            msys_sys: clang64
+            msys_env: clang-x86_64-clang
+            shell: msys2 {0}
 
     defaults:
       run:
index fa679330d8ebb664494e06d0e8ed30cffa2ef93b..708c92275bf5ea8e556d5b94a481929fc11b041a 100644 (file)
@@ -12,34 +12,24 @@ jobs:
     strategy:
       matrix:
         config:
-          - {
-              name: "Ubuntu 20.04 GCC",
-              os: ubuntu-20.04,
-              compiler: g++,
-              comp: gcc,
-              shell: 'bash {0}'
-            }
+          - name: Ubuntu 20.04 GCC
+            os: ubuntu-20.04
+            compiler: g++
+            comp: gcc
+            shell: bash {0}
         sanitizers:
-          - {
-              name: Run with thread sanitizer,
-              make_option: sanitize=thread,
-              instrumented_option: sanitizer-thread
-            }
-          - {
-              name: Run with UB sanitizer,
-              make_option: sanitize=undefined,
-              instrumented_option: sanitizer-undefined
-            }
-          - {
-              name: Run under valgrind,
-              make_option: "",
-              instrumented_option: valgrind
-            }
-          - {
-              name: Run under valgrind-thread,
-              make_option: "",
-              instrumented_option: valgrind-thread
-            }
+          - name: Run with thread sanitizer
+            make_option: sanitize=thread
+            instrumented_option: sanitizer-thread
+          - name: Run with UB sanitizer
+            make_option: sanitize=undefined
+            instrumented_option: sanitizer-undefined
+          - name: Run under valgrind
+            make_option: ""
+            instrumented_option: valgrind
+          - name: Run under valgrind-thread
+            make_option: ""
+            instrumented_option: valgrind-thread
     defaults:
       run:
         working-directory: src
index 953f68205bc28e5baef51d77be59ee2b57441876..8c383fe7cf84cffbafabaf1af6dd8501cee25237 100644 (file)
@@ -12,86 +12,68 @@ jobs:
     strategy:
       matrix:
         config:
-          - {
-              name: "Ubuntu 20.04 GCC",
-              os: ubuntu-20.04,
-              compiler: g++,
-              comp: gcc,
-              run_32bit_tests: true,
-              run_64bit_tests: true,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Ubuntu 20.04 Clang",
-              os: ubuntu-20.04,
-              compiler: clang++,
-              comp: clang,
-              run_32bit_tests: true,
-              run_64bit_tests: true,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Android NDK aarch64",
-              os: ubuntu-20.04,
-              compiler: aarch64-linux-android21-clang++,
-              comp: ndk,
-              run_armv8_tests: true,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Android NDK arm",
-              os: ubuntu-20.04,
-              compiler: armv7a-linux-androideabi21-clang++,
-              comp: ndk,
-              run_armv7_tests: true,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "MacOS 12 Apple Clang",
-              os: macos-12,
-              compiler: clang++,
-              comp: clang,
-              run_64bit_tests: true,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "MacOS 12 GCC 11",
-              os: macos-12,
-              compiler: g++-11,
-              comp: gcc,
-              run_64bit_tests: true,
-              shell: 'bash {0}'
-            }
-          - {
-              name: "Windows 2022 Mingw-w64 GCC x86_64",
-              os: windows-2022,
-              compiler: g++,
-              comp: mingw,
-              run_64bit_tests: true,
-              msys_sys: 'mingw64',
-              msys_env: 'x86_64-gcc',
-              shell: 'msys2 {0}'
-            }
-          - {
-              name: "Windows 2022 Mingw-w64 GCC i686",
-              os: windows-2022,
-              compiler: g++,
-              comp: mingw,
-              run_32bit_tests: true,
-              msys_sys: 'mingw32',
-              msys_env: 'i686-gcc',
-              shell: 'msys2 {0}'
-            }
-          - {
-              name: "Windows 2022 Mingw-w64 Clang x86_64",
-              os: windows-2022,
-              compiler: clang++,
-              comp: clang,
-              run_64bit_tests: true,
-              msys_sys: 'clang64',
-              msys_env: 'clang-x86_64-clang',
-              shell: 'msys2 {0}'
-            }
+          - name: Ubuntu 20.04 GCC
+            os: ubuntu-20.04
+            compiler: g++
+            comp: gcc
+            run_32bit_tests: true
+            run_64bit_tests: true
+            shell: bash {0}
+          - name: Ubuntu 20.04 Clang
+            os: ubuntu-20.04
+            compiler: clang++
+            comp: clang
+            run_32bit_tests: true
+            run_64bit_tests: true
+            shell: bash {0}
+          - name: Android NDK aarch64
+            os: ubuntu-22.04
+            compiler: aarch64-linux-android21-clang++
+            comp: ndk
+            run_armv8_tests: true
+            shell: bash {0}
+          - name: Android NDK arm
+            os: ubuntu-22.04
+            compiler: armv7a-linux-androideabi21-clang++
+            comp: ndk
+            run_armv7_tests: true
+            shell: bash {0}
+          - name: MacOS 12 Apple Clang
+            os: macos-12
+            compiler: clang++
+            comp: clang
+            run_64bit_tests: true
+            shell: bash {0}
+          - name: MacOS 12 GCC 11
+            os: macos-12
+            compiler: g++-11
+            comp: gcc
+            run_64bit_tests: true
+            shell: bash {0}
+          - name: Windows 2022 Mingw-w64 GCC x86_64
+            os: windows-2022
+            compiler: g++
+            comp: mingw
+            run_64bit_tests: true
+            msys_sys: mingw64
+            msys_env: x86_64-gcc
+            shell: msys2 {0}
+          - name: Windows 2022 Mingw-w64 GCC i686
+            os: windows-2022
+            compiler: g++
+            comp: mingw
+            run_32bit_tests: true
+            msys_sys: mingw32
+            msys_env: i686-gcc
+            shell: msys2 {0}
+          - name: Windows 2022 Mingw-w64 Clang x86_64
+            os: windows-2022
+            compiler: clang++
+            comp: clang
+            run_64bit_tests: true
+            msys_sys: clang64
+            msys_env: clang-x86_64-clang
+            shell: msys2 {0}
     defaults:
       run:
         working-directory: src
@@ -107,6 +89,20 @@ jobs:
           sudo apt update
           sudo apt install expect valgrind g++-multilib qemu-user
 
+      - name: Install NDK
+        if: runner.os == 'Linux'
+        run: |
+          if [ $COMP == ndk ]; then
+            NDKV="21.4.7075529"
+            ANDROID_ROOT=/usr/local/lib/android
+            ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
+            SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
+            echo "y" | $SDKMANAGER "ndk;$NDKV"
+            ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$NDKV
+            ANDROID_NDK_BIN=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin
+            echo "ANDROID_NDK_BIN=$ANDROID_NDK_BIN" >> $GITHUB_ENV
+          fi
+
       - name: Setup msys and install required packages
         if: runner.os == 'Windows'
         uses: msys2/setup-msys2@v2
@@ -125,12 +121,7 @@ jobs:
       - name: Check compiler
         run: |
           if [ $COMP == ndk ]; then
-            ANDROID_ROOT=/usr/local/lib/android
-            ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
-            SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
-            echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-            ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-            export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+            export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
           fi
           $COMPILER -v
 
@@ -228,12 +219,7 @@ jobs:
       - name: Test armv8 build
         if: ${{ matrix.config.run_armv8_tests }}
         run: |
-          ANDROID_ROOT=/usr/local/lib/android
-          ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
-          SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
-          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-          ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-          export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+          export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
           export LDFLAGS="-static -Wno-unused-command-line-argument"
           make clean
           make -j2 ARCH=armv8 build
@@ -244,12 +230,7 @@ jobs:
       - name: Test armv7 build
         if: ${{ matrix.config.run_armv7_tests }}
         run: |
-          ANDROID_ROOT=/usr/local/lib/android
-          ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
-          SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
-          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-          ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-          export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+          export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
           export LDFLAGS="-static -Wno-unused-command-line-argument"
           make clean
           make -j2 ARCH=armv7 build
@@ -258,12 +239,7 @@ jobs:
       - name: Test armv7-neon build
         if: ${{ matrix.config.run_armv7_tests }}
         run: |
-          ANDROID_ROOT=/usr/local/lib/android
-          ANDROID_SDK_ROOT=$ANDROID_ROOT/sdk
-          SDKMANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
-          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-          ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-          export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+          export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
           export LDFLAGS="-static -Wno-unused-command-line-argument"
           make clean
           make -j2 ARCH=armv7-neon build