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 list of deprecated APIs so APIs are actually stripped in V2. (backport #17708) #17709

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2021

This is an automatic backport of pull request #17708 done by Mergify.
Cherry-pick of 28332e3 has failed:

On branch mergify/bp/master/pr-17708
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 28332e3a5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   scripts/list-deprecated-apis.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deprecated_apis.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…2. (#17708)

The change to strip deprecated APIs based on a list was introduced several weeks
ago; however, that list was built off of the v1/master branch, not v2. This
meant the FQNs of all of the types was wrong, leading to *nothing* being
stripped, and all deprecated APIs being re-introduced into the V2 source.

This change re-builds the deprecated_apis.txt list so the correct APIs are
removed from V2. Also fixed a bug with submodules in the list-deprecated-apis script.

----

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

(cherry picked from commit 28332e3)

# Conflicts:
#	deprecated_apis.txt
@mergify mergify bot added the conflicts label Nov 25, 2021
@gitpod-io
Copy link

gitpod-io bot commented Nov 25, 2021

@github-actions github-actions bot added the aws-cdk-lib Related to the aws-cdk-lib package label Nov 25, 2021
@njlynch njlynch assigned njlynch and unassigned nija-at Nov 25, 2021
rix0rrr
rix0rrr previously approved these changes Nov 25, 2021
@mergify mergify bot dismissed rix0rrr’s stale review November 25, 2021 18:44

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 9d729a9
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@njlynch njlynch closed this Dec 1, 2021
@mergify mergify bot deleted the mergify/bp/master/pr-17708 branch December 1, 2021 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
aws-cdk-lib Related to the aws-cdk-lib package conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants