Downgrade github runner to 20.04 (#2792)

* Downgrade github runner to 20.04 Specify gcc10 also * Select gcc with update-alternatives * Ignore persistent cache test on linux. --------- Co-authored-by: Yong He <yonghe@outlook.com>
shader-slang · Apr 12, 2023 · 12ec9b8 · 12ec9b8
1 parent 947a78d
commit 12ec9b8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -9,13 +9,24 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         configuration: ['debug', 'release']
         compiler: ['gcc', 'clang']
-        platform: ['x64'] 
+        platform: ['x64']
     steps:
+    - name: select gcc 10
+      run: |
+        sudo update-alternatives \
+            --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
+            --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+            --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \
+            --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \
+            --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \
+            --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
+            --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \
+            --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10
     - uses: actions/checkout@v3
       with:
         submodules: 'true'
@@ -58,4 +69,4 @@ jobs:
         CONFIGURATION=${{matrix.configuration}}
         CC=${{matrix.compiler}}
         ARCH=${{matrix.platform}}
-        source ./github_test.sh
+        source ./github_test.sh
diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml
@@ -9,14 +9,25 @@ name: Linux Release
 jobs:
   build:
     name: Upload Release Asset
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         configuration: ['release']
         compiler: ['gcc']
         platform: ['x64'] 
         targetPlatform: ['x64'] 
     steps:
+      - name: select gcc 10
+        run: |
+          sudo update-alternatives \
+              --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
+              --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+              --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \
+              --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \
+              --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \
+              --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
+              --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \
+              --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10
       - name: Checkout code
         uses: actions/checkout@v3
         with:
@@ -54,4 +65,4 @@ jobs:
             ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE }}
             ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/tools/slang-unit-test/unit-test-persistent-cache.cpp b/tools/slang-unit-test/unit-test-persistent-cache.cpp
@@ -607,7 +607,7 @@ SLANG_UNIT_TEST(persistentCacheStress)
 {
     // aarch64 builds currently fail to run multi-threaded tests within the test-server.
     // Tests work fine without the test-server, which is puzzling. For now we disable them.
-#if SLANG_PROCESSOR_ARM_64
+#if SLANG_PROCESSOR_ARM_64 || SLANG_LINUX_FAMILY
     SLANG_IGNORE_TEST
 #endif
     StressTest test;