Skip to content

Commit be6d362

Browse files
authored
Merge branch 'master' into updates/various
2 parents a501102 + 44bdaee commit be6d362

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
strategy:
6262
fail-fast: false
6363
matrix:
64-
os: [macos-latest, ubuntu-latest]
64+
# TODO: This doesn't work with arm64 Macs yet. That is due to openssl being x86 only here.
65+
# Since macos-14+ requires "-large" we have to disable this for now.
66+
os: [ubuntu-latest]
6567
bazel_version: [latest] # rules_rust bzlmod support is experimental and needs latest version as of now (20230912).
6668
bzlmod: [true, false]
6769
runs-on: ${{ matrix.os }}

.trunk/trunk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ lint:
5757
batch: true
5858
in_place: true
5959
enabled:
60-
- actionlint@1.6.25
60+
- actionlint@1.7.8
6161
6262
6363
- git-diff-check

0 commit comments

Comments
 (0)