From fad47a69ab37e8fbbdba207c89a3bf567c861bc3 Mon Sep 17 00:00:00 2001
From: helly25 <marcus.boerger@gmail.com>
Date: Sat, 1 Nov 2025 14:27:20 +0100
Subject: [PATCH 1/2] Update some OS targets. Most importantly replace macOS 13
 with newer versions.

---
 .github/workflows/tests.yml        |  9 +++----
 tests/scripts/ubuntu_24_04_test.sh | 41 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100755 tests/scripts/ubuntu_24_04_test.sh

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 876da978..cbee4887 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -61,8 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: This doesn't work with arm64 Macs yet, hence pinning to macos-13.
-        os: [macos-13, ubuntu-latest]
+        os: [macos-26, macos-15-intel, ubuntu-latest]
         bazel_version: [latest] # rules_rust bzlmod support is experimental and needs latest version as of now (20230912).
         bzlmod: [true, false]
     runs-on: ${{ matrix.os }}
@@ -79,15 +78,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        script:
-          [
+        script: [
             archlinux,
             debian,
             fedora,
             suse_leap,
             suse_tumbleweed,
-            ubuntu_20_04,
+            ubuntu_20_04, # Includes omp tests
             ubuntu_22_04,
+            ubuntu_24_04,
             linux_sysroot,
           ]
         bzlmod: [true, false]
diff --git a/tests/scripts/ubuntu_24_04_test.sh b/tests/scripts/ubuntu_24_04_test.sh
new file mode 100755
index 00000000..d26917f2
--- /dev/null
+++ b/tests/scripts/ubuntu_24_04_test.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Copyright 2020 The Bazel Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+images=(
+  "ubuntu:24.04"
+)
+
+git_root=$(git rev-parse --show-toplevel)
+readonly git_root
+
+for image in "${images[@]}"; do
+  docker pull "${image}"
+  docker run --rm --entrypoint=/bin/bash --env USE_BZLMOD --volume="${git_root}:/src:ro" "${image}" -c """
+set -exuo pipefail
+
+# Common setup
+export DEBIAN_FRONTEND=noninteractive
+apt-get -qq update
+apt-get -qq -y install curl libtinfo6 libxml2 zlib1g-dev >/dev/null
+# The above command gives some verbose output that can not be silenced easily.
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288778
+
+# Run tests
+cd /src
+tests/scripts/run_tests.sh -O
+"""
+done

From f4750e78238d1bb8af3db93639f66dfc29a52707 Mon Sep 17 00:00:00 2001
From: helly25 <marcus.boerger@gmail.com>
Date: Sat, 1 Nov 2025 15:15:43 +0100
Subject: [PATCH 2/2] Disable external macos testing for now.

---
 .github/workflows/tests.yml | 4 +++-
 .trunk/trunk.yaml           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cbee4887..f747d9f4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -61,7 +61,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-26, macos-15-intel, ubuntu-latest]
+        # TODO: This doesn't work with arm64 Macs yet. That is due to openssl being x86 only here.
+        # Since macos-14+ requires "-large" we have to disable this for now.
+        os: [ubuntu-latest]
         bazel_version: [latest] # rules_rust bzlmod support is experimental and needs latest version as of now (20230912).
         bzlmod: [true, false]
     runs-on: ${{ matrix.os }}
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 2a07b173..c3a42414 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -57,7 +57,7 @@ lint:
           batch: true
           in_place: true
   enabled:
-    - actionlint@1.6.25
+    - actionlint@1.7.8
     - buildifier@7.1.0
     - checkov@2.4.9
     - git-diff-check