Install OpenSSL since tester3 is enforced.

New runners do not seem to come with openssl pre-installed. Also fix artifacts name for build native, and fix dependencies. Increase runner size and switch to SVE.
blapie · Oct 3, 2024 · d0327d4 · d0327d4
1 parent dc8df2f
commit d0327d4
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, ah-ubuntu_22_04-c6g_x-50]
+        os: [ubuntu-latest, ah-ubuntu_22_04-c7g_2x-50]
         compiler: [gcc, llvm]
 
     name: build-native-${{ matrix.os }}-${{ matrix.compiler }}
@@ -49,7 +49,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y -qq
-          sudo apt-get install -y -qq build-essential cmake curl ninja-build libgmp-dev libmpfr-dev
+          sudo apt-get install -y -qq build-essential cmake curl ninja-build libgmp-dev libmpfr-dev libssl-dev
 
       # Needed for llvm builds as well for target libraries
       - name: Install gcc
@@ -76,13 +76,13 @@ jobs:
 
       - name: Set AArch64 Neon config
         shell: bash -ex -o pipefail {0}
-        if: contains(${{ matrix.os }}, 'c6g')
+        if: contains(matrix.os, 'c6g')
         run: |
             export EXTRA_CMAKE_FLAGS=""
 
       - name: Set AArch64 SVE config
         shell: bash -ex -o pipefail {0}
-        if: contains(${{ matrix.os }}, 'c7g')
+        if: contains(matrix.os, 'c7g')
         run: |
             export EXTRA_CMAKE_FLAGS="-DSLEEF_ENFORCE_SVE=ON"
 
@@ -97,10 +97,10 @@ jobs:
           cmake --build _build-native
           cmake --install _build-native
 
-      - name: Upload build-native-${{ matrix.compiler }} artifacts
+      - name: Upload build-native-${{ matrix.os }}-${{ matrix.compiler }} artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: build-native-${{ matrix.compiler }}
+          name: build-native-${{ matrix.os }}-${{ matrix.compiler }}
           path: |
             _build-*
             _install-*
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, ah-ubuntu_22_04-c6g_x-50]
+        os: [ubuntu-latest, ah-ubuntu_22_04-c7g_2x-50]
         compiler: [gcc, llvm]
 
     name: test-native-${{ matrix.os }}-${{ matrix.compiler }}
@@ -122,7 +122,7 @@ jobs:
           persist-credentials: false
 
       - name: Install dependencies
-        run: sudo apt-get update -y -qq && sudo apt-get install -y -qq libgmp-dev libmpfr-dev
+        run: sudo apt-get update -y -qq && sudo apt-get install -y -qq cmake libgmp-dev libmpfr-dev libssl-dev
 
       - name: Print host CPU info
         run: |