From 9fc203a3d05262ac74bfca8b4618155e18d76003 Mon Sep 17 00:00:00 2001 From: ppigazzini Date: Thu, 8 Dec 2022 18:32:30 +0100 Subject: [PATCH] Set the right PATH for ARM compiler and build tests in CI Fix for the GitHub upgrade: https://github.com/actions/runner-images/issues/5879 that broke our ARM workflows because it changed the value of the ANDROID_NDK_HOME variable referenced in our PATH. closes https://github.com/official-stockfish/Stockfish/pull/4267 No functional change --- .github/workflows/stockfish_test.yml | 43 ++++++++++++---------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/.github/workflows/stockfish_test.yml b/.github/workflows/stockfish_test.yml index 46b4e26f..e4e6205f 100644 --- a/.github/workflows/stockfish_test.yml +++ b/.github/workflows/stockfish_test.yml @@ -35,7 +35,7 @@ jobs: os: ubuntu-20.04, compiler: aarch64-linux-android21-clang++, comp: ndk, - run_armv8_tests: false, + run_armv8_tests: true, shell: 'bash {0}' } - { @@ -43,7 +43,7 @@ jobs: os: ubuntu-20.04, compiler: armv7a-linux-androideabi21-clang++, comp: ndk, - run_armv7_tests: false, + run_armv7_tests: true, shell: 'bash {0}' } - { @@ -92,15 +92,6 @@ jobs: msys_env: 'clang-x86_64-clang', shell: 'msys2 {0}' } - exclude: - - config: - { - name: "Ubuntu 20.04 NDK armv7" - } - - config: - { - name: "Ubuntu 20.04 NDK armv8" - } defaults: run: working-directory: src @@ -120,8 +111,8 @@ jobs: if: runner.os == 'Windows' uses: msys2/setup-msys2@v2 with: - msystem: ${{matrix.config.msys_sys}} - install: mingw-w64-${{matrix.config.msys_env}} make git expect + msystem: ${{ matrix.config.msys_sys }} + install: mingw-w64-${{ matrix.config.msys_env }} make git expect - name: Download the used network from the fishtest framework run: | @@ -134,7 +125,14 @@ jobs: - name: Check compiler run: | - export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin + 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 + fi $COMPILER -v - name: Test help target @@ -233,9 +231,8 @@ jobs: 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-bundle - ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT - export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH + ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529 + export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH export LDFLAGS="-static -Wno-unused-command-line-argument" make clean make -j2 ARCH=armv8 build @@ -250,9 +247,8 @@ jobs: 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-bundle - ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT - export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH + ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529 + export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH export LDFLAGS="-static -Wno-unused-command-line-argument" make clean make -j2 ARCH=armv7 build @@ -265,9 +261,8 @@ jobs: 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-bundle - ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT - export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH + ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529 + export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH export LDFLAGS="-static -Wno-unused-command-line-argument" make clean make -j2 ARCH=armv7-neon build @@ -281,4 +276,4 @@ jobs: make clean make -j2 ARCH=x86-64-modern build ../tests/perft.sh - ../tests/reprosearch.sh \ No newline at end of file + ../tests/reprosearch.sh -- 2.39.2