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

chore: restore ability to release maintenance version lines #1386

Conversation

mrgrain
Copy link
Contributor

@mrgrain mrgrain commented May 20, 2024

Same as aws/jsii-compiler#998, but for jsii-rosetta

This repo was using an automatic backport feature for repository config. As part of daily upgrades, the projen config would be checked out from main and applied to maintenance branches. However because we also defined the current version in this config, this inadvertently changed the current version for maintenance branches as well! In practice that meant that the release tagging workflow tagged the wrong release lines.

This fix does two things:

  • Disable the automatic backport of configuration in favor of the new, explicit label based backport feature (see it in action on this PR!)
  • Add an explicit release line option to the tagging workflow, that will be compared against the detected TypeScript version and fail if they don't match.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@mrgrain mrgrain marked this pull request as ready for review May 20, 2024 11:49
@aws-cdk-automation aws-cdk-automation added this pull request to the merge queue May 20, 2024
Merged via the queue into main with commit 08daef4 May 20, 2024
13 of 14 checks passed
@aws-cdk-automation aws-cdk-automation deleted the mrgrain/chore/ci/config-backport-prevents-old-releases branch May 20, 2024 13:01
aws-cdk-automation pushed a commit that referenced this pull request May 20, 2024
Same as aws/jsii-compiler#998, but for
jsii-rosetta

This repo was using an automatic backport feature for repository config.
As part of daily upgrades, the projen config would be checked out from
`main` and applied to maintenance branches. However because we also
defined the current version in this config, this inadvertently changed
the current version for maintenance branches as well! In practice that
meant that the release tagging workflow tagged the wrong release lines.

This fix does two things:
- Disable the automatic backport of configuration in favor of the new,
explicit label based backport feature (see it in action on this PR!)
- Add an explicit release line option to the tagging workflow, that will
be compared against the detected TypeScript version and fail if they
don't match.

---

By submitting this pull request, I confirm that my contribution is made
under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0

(cherry picked from commit 08daef4)
aws-cdk-automation pushed a commit that referenced this pull request May 20, 2024
Same as aws/jsii-compiler#998, but for
jsii-rosetta

This repo was using an automatic backport feature for repository config.
As part of daily upgrades, the projen config would be checked out from
`main` and applied to maintenance branches. However because we also
defined the current version in this config, this inadvertently changed
the current version for maintenance branches as well! In practice that
meant that the release tagging workflow tagged the wrong release lines.

This fix does two things:
- Disable the automatic backport of configuration in favor of the new,
explicit label based backport feature (see it in action on this PR!)
- Add an explicit release line option to the tagging workflow, that will
be compared against the detected TypeScript version and fail if they
don't match.

---

By submitting this pull request, I confirm that my contribution is made
under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0

(cherry picked from commit 08daef4)
@aws-cdk-automation
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
maintenance/v5.2 An unhandled error occurred. Please see the logs for details
maintenance/v5.3

Manual backport

To create the backport manually run:

backport --pr 1386

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

aws-cdk-automation pushed a commit that referenced this pull request May 20, 2024
Same as aws/jsii-compiler#998, but for
jsii-rosetta

This repo was using an automatic backport feature for repository config.
As part of daily upgrades, the projen config would be checked out from
`main` and applied to maintenance branches. However because we also
defined the current version in this config, this inadvertently changed
the current version for maintenance branches as well! In practice that
meant that the release tagging workflow tagged the wrong release lines.

This fix does two things:
- Disable the automatic backport of configuration in favor of the new,
explicit label based backport feature (see it in action on this PR!)
- Add an explicit release line option to the tagging workflow, that will
be compared against the detected TypeScript version and fail if they
don't match.

---

By submitting this pull request, I confirm that my contribution is made
under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0

(cherry picked from commit 08daef4)
@aws-cdk-automation
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
maintenance/v5.2
maintenance/v5.3

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

github-merge-queue bot pushed a commit that referenced this pull request May 20, 2024
…1386) (#1387)

# Backport

This will backport the following commits from `main` to
`maintenance/v5.2`:
- [chore: restore ability to release maintenance version lines
(#1386)](#1386)

<!--- Backport version: 9.5.1 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

---------

Co-authored-by: Momo Kornher <kornherm@amazon.co.uk>
github-merge-queue bot pushed a commit that referenced this pull request May 20, 2024
…1386) (#1388)

# Backport

This will backport the following commits from `main` to
`maintenance/v5.3`:
- [chore: restore ability to release maintenance version lines
(#1386)](#1386)

<!--- Backport version: 9.5.1 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

---------

Co-authored-by: Momo Kornher <kornherm@amazon.co.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants