Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
target: aarch64-apple-darwin

name: macOS ${{ matrix.arch }}
runs-on: macos-14
runs-on: macos-26

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
Expand Down Expand Up @@ -108,9 +108,9 @@ jobs:
- name: Download x86_64 OpenSSL
if: matrix.arch == 'x86_64' && steps.cache-openssl-x86.outputs.cache-hit != 'true'
run: |
brew fetch --bottle-tag=sonoma openssl@3
arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale OpenSSL cache after tag

Medium Severity

The x86_64 OpenSSL download now uses arch -x86_64 and --bottle-tag=tahoe, but the actions/cache key is still openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }}. A cache hit skips the new fetch and restores libraries from the old sonoma/native brew path, which can be the wrong architecture or macOS bottle for macos-26 cross-compiles.

Additional Locations (2)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 9114bc6. Configure here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no cache hit on this PR, so I don't think this is relevant

mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR
tar xzf $(brew --cache --bottle-tag=sonoma openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2

- name: Cache Dependencies
uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # 2.8.2
Expand All @@ -130,7 +130,7 @@ jobs:
macos_universal:
needs: macos
name: macOS universal
runs-on: macos-14
runs-on: macos-26

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

name: Windows ${{ matrix.arch }}
runs-on: windows-2022
runs-on: windows-2025

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
os: ubuntu-24.04
display-os: Linux
- target: x86_64-pc-windows-msvc
os: windows-2022
os: windows-2025
display-os: Windows
- target: aarch64-apple-darwin
os: macos-14
os: macos-26
display-os: macOS – aarch64
- target: x86_64-apple-darwin
os: macos-14
os: macos-26
display-os: macOS – x86_64

name: ${{ matrix.display-os }}
Expand Down Expand Up @@ -77,9 +77,9 @@ jobs:
- name: Download x86_64 OpenSSL
if: matrix.target == 'x86_64-apple-darwin' && steps.cache-openssl-x86.outputs.cache-hit != 'true'
run: |
brew fetch --bottle-tag=sonoma openssl@3
arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3
mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR
tar xzf $(brew --cache --bottle-tag=sonoma openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2

- name: Cache Dependencies
uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # 2.8.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/swift-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
run-tests:
name: Run tests
runs-on: macos-15
runs-on: macos-26
steps:
- name: Checkout code
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
os: ubuntu-24.04
display-os: Linux
- target: x86_64-pc-windows-msvc
os: windows-2022
os: windows-2025
display-os: Windows
- target: aarch64-apple-darwin
os: macos-14
os: macos-26
display-os: macOS – aarch64
- target: x86_64-apple-darwin
os: macos-14
os: macos-26
display-os: macOS – x86_64

name: ${{ matrix.display-os }}
Expand Down Expand Up @@ -76,9 +76,9 @@ jobs:
- name: Download x86_64 OpenSSL
if: matrix.target == 'x86_64-apple-darwin' && steps.cache-openssl-x86.outputs.cache-hit != 'true'
run: |
brew fetch --bottle-tag=sonoma openssl@3
arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3
mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR
tar xzf $(brew --cache --bottle-tag=sonoma openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2
tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2

- name: Cache Dependencies
uses: swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # 2.8.2
Expand Down
Loading