From 4b435c35a73029117a6895f4f099530f27df1c18 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2026 09:02:09 +0000 Subject: [PATCH] ci: Remove macOS x86_64 lint and test jobs Homebrew no longer publishes Intel macOS (tahoe) bottles for openssl@3.5, so these cross-compiled jobs fail whenever the monthly OpenSSL cache misses. The repo is in maintenance mode, so drop the jobs instead of maintaining a workaround. Co-Authored-By: Daniel Szoke <7881302+szokeasaurusrex@users.noreply.github.com> --- .github/workflows/lint.yml | 32 -------------------------------- .github/workflows/test.yml | 32 -------------------------------- 2 files changed, 64 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f2758d917b..79b698c826 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,6 @@ jobs: - x86_64-unknown-linux-musl - x86_64-pc-windows-msvc - aarch64-apple-darwin - - x86_64-apple-darwin include: - target: x86_64-unknown-linux-musl os: ubuntu-24.04 @@ -30,9 +29,6 @@ jobs: - target: aarch64-apple-darwin os: macos-26 display-os: macOS – aarch64 - - target: x86_64-apple-darwin - os: macos-26 - display-os: macOS – x86_64 name: ${{ matrix.display-os }} runs-on: ${{ matrix.os }} @@ -53,34 +49,6 @@ jobs: sudo apt-get update sudo apt-get install -y musl-tools - # On x86_64, this environment variable specifies to the openssl-sys crate - # where to find the OpenSSL library. - - name: Set OpenSSL env (x86_64) - if: matrix.target == 'x86_64-apple-darwin' - run: echo "X86_64_APPLE_DARWIN_OPENSSL_DIR=${{ github.workspace }}/openssl-x86_64" >> $GITHUB_ENV - - - name: Get OpenSSL cache month (x86_64) - if: matrix.target == 'x86_64-apple-darwin' - id: cache-date - run: echo "month=$(date +%Y-%m)" >> $GITHUB_OUTPUT - - - name: Cache x86_64 OpenSSL - if: matrix.target == 'x86_64-apple-darwin' - id: cache-openssl-x86 - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # 6.1.0 - with: - path: ${{ env.X86_64_APPLE_DARWIN_OPENSSL_DIR }} - key: openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }} - - # To cross-compile for x86_64 from an ARM-based macOS runner, we need to have the - # x86_64 OpenSSL libraries installed locally. - - name: Download x86_64 OpenSSL - if: matrix.target == 'x86_64-apple-darwin' && steps.cache-openssl-x86.outputs.cache-hit != 'true' - run: | - arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3.5 - mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR - tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3.5) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2 - - name: Cache Dependencies uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # 2.9.1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34fa71c9cb..fcacfd97a2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,6 @@ jobs: - x86_64-unknown-linux-musl - x86_64-pc-windows-msvc - aarch64-apple-darwin - - x86_64-apple-darwin include: - target: x86_64-unknown-linux-musl os: ubuntu-24.04 @@ -30,9 +29,6 @@ jobs: - target: aarch64-apple-darwin os: macos-26 display-os: macOS – aarch64 - - target: x86_64-apple-darwin - os: macos-26 - display-os: macOS – x86_64 name: ${{ matrix.display-os }} runs-on: ${{ matrix.os }} @@ -52,34 +48,6 @@ jobs: sudo apt-get update sudo apt-get install -y musl-tools - # On x86_64, this environment variable specifies to the openssl-sys crate - # where to find the OpenSSL library. - - name: Set OpenSSL env (x86_64) - if: matrix.target == 'x86_64-apple-darwin' - run: echo "X86_64_APPLE_DARWIN_OPENSSL_DIR=${{ github.workspace }}/openssl-x86_64" >> $GITHUB_ENV - - - name: Get OpenSSL cache month (x86_64) - if: matrix.target == 'x86_64-apple-darwin' - id: cache-date - run: echo "month=$(date +%Y-%m)" >> $GITHUB_OUTPUT - - - name: Cache x86_64 OpenSSL - if: matrix.target == 'x86_64-apple-darwin' - id: cache-openssl-x86 - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # 6.1.0 - with: - path: ${{ env.X86_64_APPLE_DARWIN_OPENSSL_DIR }} - key: openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }} - - # To cross-compile for x86_64 from an ARM-based macOS runner, we need to have the - # x86_64 OpenSSL libraries installed locally. - - name: Download x86_64 OpenSSL - if: matrix.target == 'x86_64-apple-darwin' && steps.cache-openssl-x86.outputs.cache-hit != 'true' - run: | - arch -x86_64 brew fetch --bottle-tag=tahoe openssl@3.5 - mkdir -p $X86_64_APPLE_DARWIN_OPENSSL_DIR - tar xzf $(arch -x86_64 brew --cache --bottle-tag=tahoe openssl@3.5) -C $X86_64_APPLE_DARWIN_OPENSSL_DIR --strip-components=2 - - name: Cache Dependencies uses: swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # 2.9.1