From 904a9031baf365f20627eb86953211986b269a99 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Mon, 9 Dec 2024 16:38:10 -0700 Subject: [PATCH] roll back ubuntu version used with CI --- .github/workflows/hostap-vm.yml | 6 +++--- .github/workflows/ipmitool.yml | 4 ++-- .github/workflows/jwt-cpp.yml | 4 ++-- .github/workflows/krb5.yml | 4 ---- .github/workflows/multi-compiler.yml | 2 +- .github/workflows/zephyr.yml | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/hostap-vm.yml b/.github/workflows/hostap-vm.yml index 0beecebc28..175116e69a 100644 --- a/.github/workflows/hostap-vm.yml +++ b/.github/workflows/hostap-vm.yml @@ -28,7 +28,7 @@ jobs: --enable-tlsv10 --enable-oldtls name: Build wolfSSL if: github.repository_owner == 'wolfssl' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # This should be a safe limit for the tests to run. timeout-minutes: 10 steps: @@ -66,7 +66,7 @@ jobs: build_uml_linux: name: Build UML (UserMode Linux) if: github.repository_owner == 'wolfssl' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # This should be a safe limit for the tests to run. timeout-minutes: 10 steps: @@ -143,7 +143,7 @@ jobs: name: hwsim test # For openssl 1.1 if: github.repository_owner == 'wolfssl' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # This should be a safe limit for the tests to run. timeout-minutes: 45 needs: [build_wolfssl, build_uml_linux] diff --git a/.github/workflows/ipmitool.yml b/.github/workflows/ipmitool.yml index 1dc2c18e58..be371f969b 100644 --- a/.github/workflows/ipmitool.yml +++ b/.github/workflows/ipmitool.yml @@ -17,7 +17,7 @@ jobs: build_wolfssl: name: Build wolfSSL # Just to keep it the same as the testing target - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: github.repository_owner == 'wolfssl' # This should be a safe limit for the tests to run. timeout-minutes: 4 @@ -48,7 +48,7 @@ jobs: git_ref: [ c3939dac2c060651361fc71516806f9ab8c38901 ] name: ${{ matrix.git_ref }} if: github.repository_owner == 'wolfssl' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: build_wolfssl steps: - name: Install dependencies diff --git a/.github/workflows/jwt-cpp.yml b/.github/workflows/jwt-cpp.yml index 3b8348ad77..2e44b57f1b 100644 --- a/.github/workflows/jwt-cpp.yml +++ b/.github/workflows/jwt-cpp.yml @@ -17,7 +17,7 @@ jobs: name: Build wolfSSL # Just to keep it the same as the testing target if: github.repository_owner == 'wolfssl' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # This should be a safe limit for the tests to run. timeout-minutes: 4 steps: @@ -47,7 +47,7 @@ jobs: matrix: config: - ref: 0.7.0 - runner: ubuntu-latest + runner: ubuntu-20.04 - ref: 0.6.0 runner: ubuntu-22.04 name: ${{ matrix.config.ref }} diff --git a/.github/workflows/krb5.yml b/.github/workflows/krb5.yml index 2b69761d2d..1f4424a289 100644 --- a/.github/workflows/krb5.yml +++ b/.github/workflows/krb5.yml @@ -21,10 +21,6 @@ jobs: # This should be a safe limit for the tests to run. timeout-minutes: 5 steps: - - name: workaround high-entropy ASLR - # not needed after either an update to llvm or runner is done - run: sudo sysctl vm.mmap_rnd_bits=28 - - name: Build wolfSSL uses: wolfSSL/actions-build-autotools-project@v1 with: diff --git a/.github/workflows/multi-compiler.yml b/.github/workflows/multi-compiler.yml index 0606833025..e1b15f434f 100644 --- a/.github/workflows/multi-compiler.yml +++ b/.github/workflows/multi-compiler.yml @@ -42,7 +42,7 @@ jobs: OS: ubuntu-20.04 - CC: clang-13 CXX: clang++-13 - OS: ubuntu-latest + OS: ubuntu-22.04 - CC: clang-14 CXX: clang++-14 OS: ubuntu-latest diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 0582154c8f..a4ebe75b40 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -26,7 +26,7 @@ jobs: - zephyr-ref: v2.7.4 zephyr-sdk: 0.16.3 if: github.repository_owner == 'wolfssl' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # This should be a safe limit for the tests to run. timeout-minutes: 25 steps: