From 41bd1a7d148df433c988fde8eea3241a71259893 Mon Sep 17 00:00:00 2001 From: Josh Rotenberg Date: Wed, 27 Aug 2025 21:08:48 -0700 Subject: [PATCH 1/4] fix: add missing toolchain parameter to security workflow - Add 'toolchain: stable' to dtolnay/rust-toolchain action - Remove continue-on-error from cargo-deny since deny.toml is configured - Fixes workflow parsing error that caused immediate failure --- .github/workflows/security.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 64492dec..c3f0141f 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -33,6 +33,8 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a # stable + with: + toolchain: stable - name: Cache cargo registry uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5 @@ -89,7 +91,6 @@ print(json.dumps(sarif)) with: command: check arguments: --all-features - continue-on-error: true # Don't fail until deny.toml is configured dependency-review: name: Dependency Review From 5d9fce92ea85de118e17718f66cceb27d02b88e4 Mon Sep 17 00:00:00 2001 From: Josh Rotenberg Date: Wed, 27 Aug 2025 21:26:20 -0700 Subject: [PATCH 2/4] fix: update release workflow tag pattern to match release-plz format - Change pattern from '**[0-9]+.[0-9]+.[0-9]+*' to '**v[0-9]+.[0-9]+.[0-9]+*' - This matches tags like redisctl-v0.1.1 created by release-plz - Fixes missing binary artifacts on releases --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index beed2083..90165681 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,8 @@ on: pull_request: push: tags: - - '**[0-9]+.[0-9]+.[0-9]+*' + # Matches tags like: v1.0.0, redisctl-v0.1.1, redis-cloud-v0.2.0, etc. + - '**v[0-9]+.[0-9]+.[0-9]+*' jobs: # Run 'dist plan' (or host) to determine what tasks we need to do From b2d32db2699f1100c0e20bb65eb097007e41ee5d Mon Sep 17 00:00:00 2001 From: Josh Rotenberg Date: Thu, 28 Aug 2025 07:03:45 -0700 Subject: [PATCH 3/4] fix: add descriptive name to release workflow - Change workflow name from 'Release' to 'Release Binaries' - Makes it clearer in GitHub Actions UI what this workflow does --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90165681..1c2d280b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ # Note that the GitHub Release will be created with a generated # title/body based on your changelogs. -name: Release +name: Release Binaries permissions: "contents": "write" From e3929300ec21b05ce8c2cf677782ff2e7eb8108f Mon Sep 17 00:00:00 2001 From: Josh Rotenberg Date: Thu, 28 Aug 2025 07:06:10 -0700 Subject: [PATCH 4/4] fix: configure cargo-dist for release-plz tag format - Initialize cargo-dist properly with dist-workspace.toml - Set tag-namespace to 'redisctl' to match release-plz tags - Generated workflow now triggers on 'redisctl**[0-9]+.[0-9]+.[0-9]+*' - Removed old release.yml, using redisctl-release.yml instead - This will enable binary builds for tags like redisctl-v0.1.1 --- .../workflows/{release.yml => redisctl-release.yml} | 5 ++--- dist-workspace.toml | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) rename .github/workflows/{release.yml => redisctl-release.yml} (98%) diff --git a/.github/workflows/release.yml b/.github/workflows/redisctl-release.yml similarity index 98% rename from .github/workflows/release.yml rename to .github/workflows/redisctl-release.yml index 1c2d280b..e98c7b55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/redisctl-release.yml @@ -13,7 +13,7 @@ # Note that the GitHub Release will be created with a generated # title/body based on your changelogs. -name: Release Binaries +name: Release permissions: "contents": "write" @@ -42,8 +42,7 @@ on: pull_request: push: tags: - # Matches tags like: v1.0.0, redisctl-v0.1.1, redis-cloud-v0.2.0, etc. - - '**v[0-9]+.[0-9]+.[0-9]+*' + - 'redisctl**[0-9]+.[0-9]+.[0-9]+*' jobs: # Run 'dist plan' (or host) to determine what tasks we need to do diff --git a/dist-workspace.toml b/dist-workspace.toml index bbb0bbd1..7e4a4a42 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -7,6 +7,8 @@ members = ["cargo:."] cargo-dist-version = "0.29.0" # CI backends to support ci = "github" +# Tag pattern for releases (supports prefixed tags from release-plz) +tag-namespace = "redisctl" # The installers to generate for each app installers = ["shell", "powershell"] # Target platforms to build apps for (Rust target-triple syntax) @@ -15,13 +17,9 @@ targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-da install-path = "CARGO_HOME" # Whether to install an updater program install-updater = false -# Build only the main unified binary by default -# Users who want cloud-only or enterprise-only can build from source - -# Create checksums for artifacts +# Checksums to generate for each App checksum = "sha256" - -# Include these files in archives +# Extra static files to include in each App (path relative to this Cargo.toml's dir) include = ["LICENSE-MIT", "LICENSE-APACHE", "README.md"] # Publish to Homebrew tap (can be configured later)