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: fix candidate bump invocation #11318

Merged
merged 4 commits into from
Nov 5, 2020
Merged

Conversation

iliapolo
Copy link
Contributor

@iliapolo iliapolo commented Nov 5, 2020

Allow versions with pre-release tags in stable branches to allow BUMP_CANDIDATE to work. Otherwise, after the bump, any call to resolve-version will fail because there is a mismatch between the actual version and release.json.


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

@gitpod-io
Copy link

gitpod-io bot commented Nov 5, 2020

@iliapolo iliapolo marked this pull request as draft November 5, 2020 17:18
@iliapolo
Copy link
Contributor Author

iliapolo commented Nov 5, 2020

@eladb There was a bug in the changelog skip directive.

Even after fixing that, there is an error when running the bump-candidate.sh script:

/private/tmp/aws-cdk/aws-cdk-master/scripts/resolve-version-lib.js:47
      throw new Error(`found pre-release tag in version specified in ${versionFile} is ${currentVersion} but "releaseType"" is set to "stable"`);
      ^

Error: found pre-release tag in version specified in version.v1.json is 1.72.0-rc.0 but "releaseType"" is set to "stable"

I imagine we can just disable this check in case its a testing execution? Not sure what the implications of that though.

Feel free to take over this branch.

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 5, 2020
@mergify
Copy link
Contributor

mergify bot commented Nov 5, 2020

Title does not follow the guidelines of Conventional Commits. Please adjust title before merge.

@mergify
Copy link
Contributor

mergify bot commented Nov 5, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@eladb eladb marked this pull request as ready for review November 5, 2020 18:25
@mergify
Copy link
Contributor

mergify bot commented Nov 5, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: a231b8e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Nov 5, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit f77dbde into master Nov 5, 2020
@mergify mergify bot deleted the epolon/fix-candidate-bump branch November 5, 2020 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants