Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(release): push release to master and allow retrying releases #5482

Merged
merged 4 commits into from
Jun 7, 2023

Conversation

merceyz
Copy link
Member

@merceyz merceyz commented Jun 3, 2023

What's the problem this PR addresses?

  • Release is stopped when scripts/release/01-release-tags.sh has no work to do.
  • scripts/release/02-release-builds.sh assumes HEAD is the release commit but it might not be, for example after committing fixes to the release workflow and creating a new release.
  • The release commit isn't getting pushed to master.

Follow-up to #5476 and #5478.

How did you fix it?

  • Handle no new packages to release and change the exit code to 0.
  • Find the last release commit and check that instead of HEAD.
  • Reset the changes done to .yarnrc.yml and push the changes.

Checklist

  • I have read the Contributing Guide.
  • I have set the packages that need to be released for my changes to be effective.
  • I will check that all automated PR checks pass before the PR gets reviewed.

@merceyz merceyz requested a review from arcanis as a code owner June 3, 2023 17:53
@@ -33,9 +33,9 @@ done
RELEASE_DETAILS=$(yarn version apply --all --json ${APPLY_OPTIONS})
RELEASE_SIZE=$(wc -l <<< "$RELEASE_DETAILS")

if [[ $RELEASE_SIZE -eq 0 ]]; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check didn't work since an empty string counts as a line.

$ wc -l <<<""
1

@merceyz merceyz changed the title chore(release): fix pushing release to master chore(release): push release to master master and allow retrying releases Jun 3, 2023
@merceyz merceyz changed the title chore(release): push release to master master and allow retrying releases ci(release): push release to master master and allow retrying releases Jun 3, 2023
@arcanis arcanis merged commit 9240489 into master Jun 7, 2023
@arcanis arcanis deleted the merceyz/chore/release-workflow branch June 7, 2023 19:33
merceyz added a commit that referenced this pull request Jun 7, 2023
…ses (#5482)

**What's the problem this PR addresses?**

- Release is stopped when `scripts/release/01-release-tags.sh` has no
work to do.
- `scripts/release/02-release-builds.sh` assumes `HEAD` is the release
commit but it might not be, for example after committing fixes to the
release workflow and creating a new release.
- The release commit isn't getting pushed to `master`.

Follow-up to #5476 and
#5478.

**How did you fix it?**

- Handle no new packages to release and change the exit code to 0.
- Find the last release commit and check that instead of `HEAD`.
- Reset the changes done to `.yarnrc.yml` and push the changes.

**Checklist**
- [x] I have read the [Contributing
Guide](https://yarnpkg.com/advanced/contributing).
- [x] I have set the packages that need to be released for my changes to
be effective.
- [x] I will check that all automated PR checks pass before the PR gets
reviewed.
@merceyz merceyz changed the title ci(release): push release to master master and allow retrying releases ci(release): push release to master and allow retrying releases Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants