From 652a759321cb3de0f783a45b8fdaaddc66efc7a0 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Mon, 9 Dec 2024 17:07:54 -0700
Subject: [PATCH] adjustments to CI after ubuntu update

---
 .github/workflows/jwt-cpp.yml        | 4 ++--
 .github/workflows/krb5.yml           | 6 +-----
 .github/workflows/multi-compiler.yml | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

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 e452cb6a91..c5aa0b0522 100644
--- a/.github/workflows/krb5.yml
+++ b/.github/workflows/krb5.yml
@@ -17,14 +17,10 @@ jobs:
     name: Build wolfSSL
     # Just to keep it the same as the testing target
     if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     # 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 f4fecf6f1c..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-20.04
+            OS: ubuntu-22.04
           - CC: clang-14
             CXX: clang++-14
             OS: ubuntu-latest