Skip to content

Commit b427c85

Browse files
fix: update cargo-dist to 0.30.1 for macOS runner compatibility (#483)
The macOS-13 runner is now retired. cargo-dist 0.30.1 uses: - macos-14 for aarch64-apple-darwin - macos-15-intel for x86_64-apple-darwin
1 parent 361128b commit b427c85

File tree

2 files changed

+6
-33
lines changed

2 files changed

+6
-33
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ on:
4242
pull_request:
4343
push:
4444
tags:
45-
- "redisctl-v[0-9]+.[0-9]+.[0-9]+*"
45+
- '**[0-9]+.[0-9]+.[0-9]+*'
4646

4747
jobs:
4848
# Run 'dist plan' (or host) to determine what tasks we need to do
@@ -64,7 +64,7 @@ jobs:
6464
# we specify bash to get pipefail; it guards against the `curl` command
6565
# failing. otherwise `sh` won't catch that `curl` returned non-0
6666
shell: bash
67-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.29.0/cargo-dist-installer.sh | sh"
67+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.1/cargo-dist-installer.sh | sh"
6868
- name: Cache dist
6969
uses: actions/upload-artifact@v4
7070
with:
@@ -217,8 +217,8 @@ jobs:
217217
- plan
218218
- build-local-artifacts
219219
- build-global-artifacts
220-
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
221-
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
220+
# Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
221+
if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
222222
env:
223223
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
224224
runs-on: "ubuntu-22.04"
@@ -278,32 +278,6 @@ jobs:
278278
279279
gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/*
280280
281-
update_brew_formula:
282-
name: Update Brew Formula
283-
runs-on: ubuntu-latest
284-
needs: [plan, host]
285-
if: ${{ needs.plan.outputs.publishing == 'true' }}
286-
steps:
287-
- name: Extract version from tag
288-
id: extract_version
289-
run: |
290-
TAG="${{ github.ref_name }}"
291-
# Strip 'redisctl-v' prefix to get version number (e.g., redisctl-v0.6.6 -> 0.6.6)
292-
VERSION="${TAG#redisctl-v}"
293-
# Add 'v' prefix for Homebrew (e.g., 0.6.6 -> v0.6.6)
294-
echo "version=v${VERSION}" >> $GITHUB_OUTPUT
295-
echo "Extracted version: v${VERSION}"
296-
297-
- uses: mislav/[email protected]
298-
with:
299-
formula-name: redisctl
300-
formula-path: Formula/redisctl.rb
301-
base-branch: main
302-
tag-name: ${{ steps.extract_version.outputs.version }}
303-
homebrew-tap: joshrotenberg/homebrew-brew
304-
env:
305-
COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
306-
307281
announce:
308282
needs:
309283
- plan

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ documentation = "https://docs.rs/redisctl"
3030
# Config for 'dist'
3131
[workspace.metadata.dist]
3232
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
33-
cargo-dist-version = "0.29.0"
33+
cargo-dist-version = "0.30.1"
3434
# CI backends to support
3535
ci = "github"
3636
# The installers to generate for each app
3737
installers = ["shell", "powershell"]
3838
# Target platforms to build apps for (Rust target-triple syntax)
39-
# Note: x86_64-unknown-linux-musl removed due to keyring incompatibility with musl
4039
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
4140
# Which actions to run on pull requests
4241
pr-run-mode = "plan"
@@ -46,7 +45,7 @@ create-release = true
4645
install-path = "CARGO_HOME"
4746
# Whether to install an updater program
4847
install-updater = false
49-
# Allow custom modifications to generated CI files
48+
# Skip checking whether the specified configuration files are up to date
5049
allow-dirty = ["ci"]
5150

5251
[workspace.dependencies]

0 commit comments

Comments
 (0)