Skip to content

Conversation

arcanis
Copy link
Member

@arcanis arcanis commented Jun 2, 2023

  • The GH action doesn't fetch the master branch, so it was missing
  • The job wasn't retry-able, the npm package publishing would have failed.

@merceyz merceyz enabled auto-merge June 3, 2023 12:25
@merceyz merceyz added this pull request to the merge queue Jun 3, 2023
Merged via the queue into master with commit cbb52d2 Jun 3, 2023
@merceyz merceyz deleted the mael/release-branch-followups branch June 3, 2023 12:41
merceyz pushed a commit that referenced this pull request Jun 3, 2023
- The GH action doesn't fetch the `master` branch, so it was missing
- The job wasn't retry-able, the npm package publishing would have
failed.
arcanis pushed 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 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.
arcanis pushed a commit to yarnpkg/example-repo-zipn that referenced this pull request Jul 3, 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 yarnpkg/berry#5476 and
yarnpkg/berry#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.
@@ -59,6 +59,7 @@ jobs:
run: |
RELEASE_COMMIT=$(git rev-parse HEAD)
node ./scripts/stable-versions-store.js
git fetch origin master

This comment was marked as spam.

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.

3 participants