Skip to content

Commit 742ba6a

Browse files
committed
Merge remote-tracking branch 'origin/master' into lucasdelvoye/ref/org-list-control-endpoint
2 parents 968ef6b + 1bf4117 commit 742ba6a

6 files changed

Lines changed: 189 additions & 356 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
target: aarch64-apple-darwin
7575

7676
name: macOS ${{ matrix.arch }}
77-
runs-on: macos-14
77+
runs-on: macos-26
7878

7979
steps:
8080
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
@@ -108,9 +108,9 @@ jobs:
108108
- name: Download x86_64 OpenSSL
109109
if: matrix.arch == 'x86_64' && steps.cache-openssl-x86.outputs.cache-hit != 'true'
110110
run: |
111-
brew fetch --bottle-tag=sonoma openssl@3
111+
arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3
112112
mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR
113-
tar xzf $(brew --cache --bottle-tag=sonoma openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
113+
tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
114114
115115
- name: Cache Dependencies
116116
uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # 2.8.2
@@ -130,7 +130,7 @@ jobs:
130130
macos_universal:
131131
needs: macos
132132
name: macOS universal
133-
runs-on: macos-14
133+
runs-on: macos-26
134134

135135
steps:
136136
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # 8.0.1
@@ -229,7 +229,7 @@ jobs:
229229
TARGET: ${{ matrix.arch }}-pc-windows-msvc
230230

231231
name: Windows ${{ matrix.arch }}
232-
runs-on: windows-2022
232+
runs-on: windows-2025
233233

234234
steps:
235235
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
@@ -411,7 +411,7 @@ jobs:
411411
ref: ${{ inputs.checkout-ref }}
412412

413413
- name: Set up Docker Buildx
414-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # 4.0.0
414+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # 4.1.0
415415

416416
- name: Login to GitHub Container Registry
417417
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # 4.2.0

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
if: ${{ github.event_name == 'pull_request' }}
4848
steps:
4949
- name: Run Danger
50-
uses: getsentry/github-workflows/danger@26f565c05d0dd49f703d238706b775883037d76b # 3.3.0
50+
uses: getsentry/github-workflows/danger@607fed74f812e69201531a5185b6c3c57caa4e89 # 3.4.0
5151

5252
required:
5353
name: Check required jobs

.github/workflows/lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
os: ubuntu-24.04
2626
display-os: Linux
2727
- target: x86_64-pc-windows-msvc
28-
os: windows-2022
28+
os: windows-2025
2929
display-os: Windows
3030
- target: aarch64-apple-darwin
31-
os: macos-14
31+
os: macos-26
3232
display-os: macOS – aarch64
3333
- target: x86_64-apple-darwin
34-
os: macos-14
34+
os: macos-26
3535
display-os: macOS – x86_64
3636

3737
name: ${{ matrix.display-os }}
@@ -77,9 +77,9 @@ jobs:
7777
- name: Download x86_64 OpenSSL
7878
if: matrix.target == 'x86_64-apple-darwin' && steps.cache-openssl-x86.outputs.cache-hit != 'true'
7979
run: |
80-
brew fetch --bottle-tag=sonoma openssl@3
80+
arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3
8181
mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR
82-
tar xzf $(brew --cache --bottle-tag=sonoma openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
82+
tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
8383
8484
- name: Cache Dependencies
8585
uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # 2.8.2

.github/workflows/swift-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
run-tests:
1212
name: Run tests
13-
runs-on: macos-15
13+
runs-on: macos-26
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
os: ubuntu-24.04
2626
display-os: Linux
2727
- target: x86_64-pc-windows-msvc
28-
os: windows-2022
28+
os: windows-2025
2929
display-os: Windows
3030
- target: aarch64-apple-darwin
31-
os: macos-14
31+
os: macos-26
3232
display-os: macOS – aarch64
3333
- target: x86_64-apple-darwin
34-
os: macos-14
34+
os: macos-26
3535
display-os: macOS – x86_64
3636

3737
name: ${{ matrix.display-os }}
@@ -76,9 +76,9 @@ jobs:
7676
- name: Download x86_64 OpenSSL
7777
if: matrix.target == 'x86_64-apple-darwin' && steps.cache-openssl-x86.outputs.cache-hit != 'true'
7878
run: |
79-
brew fetch --bottle-tag=sonoma openssl@3
79+
arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3
8080
mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR
81-
tar xzf $(brew --cache --bottle-tag=sonoma openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
81+
tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
8282
8383
- name: Cache Dependencies
8484
uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # 2.8.2

0 commit comments

Comments
 (0)