From 9f3bfa9ca338192fac338906ee397fe5a230ce90 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Wed, 31 Jul 2024 22:49:13 +1000 Subject: [PATCH] Switch back to macos-latest (#1855) macos-latest is now an alias of macos-14 M1 Signed-off-by: Jiahao XU --- .github/workflows/ci.yml | 8 +-- .github/workflows/gh-action.yml | 6 +- .github/workflows/install-script.yml | 92 +++++++++++++------------- .github/workflows/release-packages.yml | 8 +-- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd0afba6..83427410 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: matrix: include: - target: aarch64-apple-darwin - os: macos-14 + os: macos-latest - target: x86_64-unknown-linux-gnu os: ubuntu-latest - target: x86_64-pc-windows-msvc @@ -143,7 +143,7 @@ jobs: - target: x86_64-unknown-linux-musl os: ubuntu-latest - target: x86_64-apple-darwin - os: macos-14 + os: macos-latest - target: aarch64-pc-windows-msvc os: windows-latest runs-on: ${{ matrix.os }} @@ -173,7 +173,7 @@ jobs: matrix: include: - target: x86_64-apple-darwin - os: macos-14 + os: macos-latest - target: x86_64-unknown-linux-gnu os: ubuntu-latest - target: x86_64-pc-windows-msvc @@ -205,7 +205,7 @@ jobs: with: event-data: ${{ toJSON(github.event) }} extract-notes-under: "### Release notes" - + release-dry-run: needs: pr-info uses: ./.github/workflows/release-cli.yml diff --git a/.github/workflows/gh-action.yml b/.github/workflows/gh-action.yml index d9aad264..20990277 100644 --- a/.github/workflows/gh-action.yml +++ b/.github/workflows/gh-action.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-14, ubuntu-latest, windows-latest ] + os: [macos-latest, ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 @@ -27,7 +27,7 @@ jobs: uses: ./ # uses action.yml from root of the repo env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + - name: Verify successful installation - display cargo-binstall's help run: cargo binstall --help @@ -35,6 +35,6 @@ jobs: run: cargo binstall -y ripgrep env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + - name: Verify successful installation - display help of installed binary run: rg --help diff --git a/.github/workflows/install-script.yml b/.github/workflows/install-script.yml index b37874b2..c13b8bc2 100644 --- a/.github/workflows/install-script.yml +++ b/.github/workflows/install-script.yml @@ -29,30 +29,30 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-14, ubuntu-latest] + os: [macos-latest, ubuntu-latest] set_cargo_home: [t, f] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Set `CARGO_HOME` - if: matrix.set_cargo_home == 't' - run: | - CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" - mkdir -p "${CARGO_HOME}/bin" - echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" + - name: Set `CARGO_HOME` + if: matrix.set_cargo_home == 't' + run: | + CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" + mkdir -p "${CARGO_HOME}/bin" + echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" - - name: Install `cargo-binstall` using scripts - run: ./install-from-binstall-release.sh - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Install `cargo-binstall` using scripts + run: ./install-from-binstall-release.sh + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Verify `cargo-binstall` installation - run: | - which cargo-binstall - cargo binstall -vV + - name: Verify `cargo-binstall` installation + run: | + which cargo-binstall + cargo binstall -vV windows: strategy: @@ -63,23 +63,23 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Set `CARGO_HOME` - if: matrix.set_cargo_home == 't' - shell: bash - run: | - CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" - mkdir -p "${CARGO_HOME}/bin" - echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" + - name: Set `CARGO_HOME` + if: matrix.set_cargo_home == 't' + shell: bash + run: | + CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" + mkdir -p "${CARGO_HOME}/bin" + echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" - - name: Install `cargo-binstall` using scripts - run: ./install-from-binstall-release.ps1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Install `cargo-binstall` using scripts + run: ./install-from-binstall-release.ps1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Verify `cargo-binstall` installation - run: cargo binstall -vV + - name: Verify `cargo-binstall` installation + run: cargo binstall -vV windows-bash: strategy: @@ -90,22 +90,22 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Set `CARGO_HOME` - if: matrix.set_cargo_home == 't' - shell: bash - run: | - CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" - mkdir -p "${CARGO_HOME}/bin" - echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" + - name: Set `CARGO_HOME` + if: matrix.set_cargo_home == 't' + shell: bash + run: | + CARGO_HOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')" + mkdir -p "${CARGO_HOME}/bin" + echo "CARGO_HOME=$CARGO_HOME" >> "$GITHUB_ENV" - - name: Install `cargo-binstall` using scripts - shell: bash - run: ./install-from-binstall-release.sh - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Install `cargo-binstall` using scripts + shell: bash + run: ./install-from-binstall-release.sh + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Verify `cargo-binstall` installation - shell: bash - run: cargo binstall -vV + - name: Verify `cargo-binstall` installation + shell: bash + run: cargo binstall -vV diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 07b5014e..4291de23 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -27,9 +27,9 @@ jobs: fail-fast: false matrix: include: - - { o: macos-14, t: x86_64-apple-darwin } - - { o: macos-14, t: x86_64h-apple-darwin } - - { o: macos-14, t: aarch64-apple-darwin, r: true } + - { o: macos-latest, t: x86_64-apple-darwin } + - { o: macos-latest, t: x86_64h-apple-darwin } + - { o: macos-latest, t: aarch64-apple-darwin, r: true } - { o: ubuntu-latest, t: x86_64-unknown-linux-gnu, @@ -140,7 +140,7 @@ jobs: name: universal-apple-darwin permissions: contents: write - runs-on: macos-14 + runs-on: macos-latest env: JUST_FOR_RELEASE: true