Skip to content

release: cut the zone.js-0.11.2 release - #38911

Closed
JiaLiPassion wants to merge 1 commit into
angular:masterfrom
JiaLiPassion:release_zone.js-0.11.2
Closed

JiaLiPassion wants to merge 1 commit into
angular:masterfrom
JiaLiPassion:release_zone.js-0.11.2

Conversation

@JiaLiPassion

Copy link
Copy Markdown
Contributor

Since this PR #38649 to test the tgz of npm_package.pack rule still need some updates ( currently the bazel run npm_package.pack fails in the Windows environment), so it will need some time to be merged, so I am testing the result manually and we can release this version first.

@mhevery mhevery added action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels Sep 23, 2020
@alxhub

alxhub commented Sep 24, 2020

Copy link
Copy Markdown
Member

Hi @JiaLiPassion,

This has merge conflicts merging to 10.1.x. Can you update the PR to be against the patch branch instead?

@JiaLiPassion

Copy link
Copy Markdown
Contributor Author

@alxub, I believe this maybe need to target: major, or maybe I didn't understand the label correct, target: patch will also merge to the master branch? I am confirming with @mhevery, thanks.

@alxhub

alxhub commented Sep 25, 2020

Copy link
Copy Markdown
Member

I'm not sure either, but the merge script does not accept it as-is:

$ yarn -s ng-dev pr merge 38911
Executing: git diff-index --quiet HEAD
Executing: git rev-parse --abbrev-ref HEAD
Executing: git fetch -f https://<TOKEN>@github.com/angular/angular.git refs/heads/master:merge_pr_target_master refs/heads/10.1.x:merge_pr_target_10.1.x pull/38911/head:merge_pr_head
From https://github.com/angular/angular
 * [new branch]            master               -> merge_pr_target_master
 * [new branch]            10.1.x               -> merge_pr_target_10.1.x
 * [new ref]               refs/pull/38911/head -> merge_pr_head
Executing: git branch merge_pr_head --contains 5aeb9a4124922d8ac08eb73b8f322905a32b0b3a
Executing: git rev-parse merge_pr_head~1
Executing: git rev-parse --abbrev-ref HEAD
Executing: git rebase --interactive --autosquash a91f0f6b82f340cfde5a01bc328d2723dc4248f0 merge_pr_head
Successfully rebased and updated refs/heads/merge_pr_head.
Executing: git checkout -f master
Switched to branch 'master'
Executing: git filter-branch -f --msg-filter /Users/arick/dev/caretaking/dev-infra/pr/merge/strategies/commit-message-filter.js 38911 a91f0f6b82f340cfde5a01bc328d2723dc4248f0..merge_pr_head
Executing: git checkout merge_pr_target_master
Switched to branch 'merge_pr_target_master'
Executing: git cherry-pick a91f0f6b82f340cfde5a01bc328d2723dc4248f0..merge_pr_head
Executing: git checkout merge_pr_target_10.1.x
Switched to branch 'merge_pr_target_10.1.x'
Executing: git cherry-pick a91f0f6b82f340cfde5a01bc328d2723dc4248f0..merge_pr_head
error: could not apply 69d3a62238... release: cut the zone.js-0.11.2 release (#38911)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Executing: git cherry-pick --abort
Executing: git checkout -f master
Switched to branch 'master'
Could not merge the specified pull request.
Could not merge pull request into the following branches due to merge conflicts: 10.1.x. Please rebase the PR or update the target label.

@JiaLiPassion

Copy link
Copy Markdown
Contributor Author

@alxhub , since this PR has conflicts with 10.1.x, I need to create a new PR for 10.1.x. So I will update this PR to target: major.

@JiaLiPassion JiaLiPassion added target: major This PR is targeted for the next major release and removed target: patch This PR is targeted for the next patch release labels Sep 28, 2020
@alxhub alxhub closed this in a6971ba Sep 30, 2020
@angular-automatic-lock-bot

Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot Bot locked and limited conversation to collaborators Oct 31, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker cla: yes target: major This PR is targeted for the next major release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants