Skip to content

Conversation

@josecorella
Copy link
Contributor

Description of changes:
Adds release updates to the mainline-1.x branch.

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

Check any applicable:

  • Were any files moved? Moving files changes their URL, which breaks all hyperlinks to the files.

@josecorella josecorella changed the title Update mainline chore: update mainline-1.x with new release process Oct 27, 2021
@josecorella josecorella marked this pull request as ready for review October 27, 2021 06:13
- git checkout $BRANCH
build:
commands:
- npx semantic-release --branches mainline-1.x --no-ci
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm okay with this for now as a first step to get mainline-1.x more in line with mainline, but this is one of the places where we should parameterize the builds with branch name so that we don't have to maintain a separate build file in each branch.

@farleyb-amazon
Copy link
Contributor

While we're at it can we update the CI buildspec file on this branch as well? Currently CI fails to run on these PRs because it's not finding the codebuild/ci/ci.yml file.

echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping"
exit 1;
fi
- export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this (and release-staging.yml) also need to checkout the right branch.


env:
variables:
BRANCH: "master"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
BRANCH: "master"
BRANCH: "mainline-1.x"

@josecorella josecorella merged commit c55c2d2 into aws:mainline-1.x Oct 27, 2021
@josecorella josecorella deleted the update_mainline branch October 27, 2021 22:15
aws-crypto-tools-ci-bot pushed a commit that referenced this pull request Oct 28, 2021
### [1.9.1](v1.9.0...v1.9.1) (2021-10-28)

### Maintenance

* Add back removed CiphertextHeaders.deserialize method ([#383](#383)) ([468625d](468625d))
* CI formatting ([#388](#388)) ([129c2c0](129c2c0))
* update mainline-1.x with new release process ([#385](#385)) ([c55c2d2](c55c2d2))
aws-crypto-tools-ci-bot pushed a commit that referenced this pull request Oct 28, 2021
### [1.9.1](v1.9.0...v1.9.1) (2021-10-28)

### Fixes

* "AWS Encryption SDK 1.9.1 Release" ([#389](#389)) ([f58051d](f58051d))

### Maintenance

* Add back removed CiphertextHeaders.deserialize method ([#383](#383)) ([468625d](468625d))
* add corretto11 ([#390](#390)) ([f3140a7](f3140a7))
* CI formatting ([#388](#388)) ([129c2c0](129c2c0))
* update mainline-1.x with new release process ([#385](#385)) ([c55c2d2](c55c2d2))
aws-crypto-tools-ci-bot pushed a commit that referenced this pull request Oct 28, 2021
### [1.9.1](v1.9.0...v1.9.1) (2021-10-28)

### Fixes

* "AWS Encryption SDK 1.9.1 Release" ([#389](#389)) ([f58051d](f58051d))
* "AWS Encryption SDK 1.9.1 Release" ([#391](#391)) ([cacee86](cacee86))

### Maintenance

* Add back removed CiphertextHeaders.deserialize method ([#383](#383)) ([468625d](468625d))
* add corretto11 ([#390](#390)) ([f3140a7](f3140a7))
* CI formatting ([#388](#388)) ([129c2c0](129c2c0))
* fix typo ([#392](#392)) ([f1f8d9f](f1f8d9f))
* update mainline-1.x with new release process ([#385](#385)) ([c55c2d2](c55c2d2))
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