Skip to content

Commit ce0ae13

Browse files
authored
Merge pull request #974 from 0xMiden/next
Trigger v0.7.1 compiler release
2 parents b061d65 + 6104f70 commit ce0ae13

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,12 @@ jobs:
7777
echo "=================="
7878
echo "${RELEASES}" | jq -rM
7979
echo "=================="
80-
release_tag=$(echo "${RELEASES}" | jq -r '.[] | select(.package_name == "midenc" or .package_name == "cargo-miden") | .tag' | head -n1)
80+
# `cargo-miden` owns the GitHub release/tag (see `release-plz.toml`), and it uses an
81+
# unprefixed tag name like `v0.7.0`. Other crates may report prefixed tags (e.g.
82+
# `midenc-v0.7.0`) which do not correspond to an actual GitHub release.
83+
release_tag=$(echo "${RELEASES}" | jq -r '.[] | select(.package_name == "cargo-miden") | .tag' | head -n1)
8184
if [ -z "${release_tag}" ] || [ "${release_tag}" = "null" ]; then
82-
echo "midenc or cargo-miden crate was not released in this run. Skipping artifact upload."
85+
echo "cargo-miden crate was not released in this run. Skipping artifact upload."
8386
echo "release_tag=" >> "${GITHUB_OUTPUT}"
8487
exit 0
8588
fi
@@ -130,7 +133,12 @@ jobs:
130133
release:
131134
name: prepare the next release
132135
runs-on: ubuntu-latest
133-
if: ${{ github.repository_owner == '0xMiden' }}
136+
needs: publish
137+
# Only prepare the next release if we didn't just create a release.
138+
# When a release PR is merged, the `publish` job will create tags/releases and publish to crates.io.
139+
# Running `release-pr` in the same workflow run before publishing completes can create a duplicate
140+
# release PR for the same version bump.
141+
if: ${{ github.repository_owner == '0xMiden' && needs.publish.result == 'success' && needs.publish.outputs.releases_created != 'true' }}
134142
permissions:
135143
contents: write
136144
pull-requests: write

release-plz.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ changelog_path = "./CHANGELOG.md"
1717
name = "cargo-miden"
1818
git_release_enable = true
1919
git_tag_enable = true
20-
git_tag_name = "{{ version }}"
21-
git_release_name = "{{ version }}"
20+
git_tag_name = "v{{ version }}"
21+
git_release_name = "v{{ version }}"
2222

2323

2424
[changelog]

0 commit comments

Comments
 (0)