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.

Sign up for GitHub

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

Jump to bottom

doc: drop <b> of v20 changelog #48649

Merged
merged 1 commit into from
Jul 6, 2023
Merged

doc: drop <b> of v20 changelog #48649

merged 1 commit into from
Jul 6, 2023

Conversation

RafaelGSS
Copy link
Member

@nodejs-github-bot nodejs-github-bot added the release Issues and PRs related to Node.js releases. label Jul 4, 2023
@RafaelGSS RafaelGSS added commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. commit-queue Add this label to land a pull request using GitHub Actions. labels Jul 5, 2023
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Jul 6, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/48649
✔  Done loading data for nodejs/node/pull/48649
----------------------------------- PR info ------------------------------------
Title      doc: drop  of v20 changelog (#48649)
Author     Rafael Gonzaga  (@RafaelGSS)
Branch     RafaelGSS:RafaelGSS-patch-2 -> nodejs:main
Labels     release, commit-queue-squash
Commits    2
 - doc: drop  of v20 changelog
 - Merge branch 'main' into RafaelGSS-patch-2
Committers 1
 - GitHub 
PR-URL: https://github.com/nodejs/node/pull/48649
Reviewed-By: Moshe Atlow 
Reviewed-By: Michaël Zasso 
Reviewed-By: Luigi Pinca 
Reviewed-By: Richard Lau 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/48649
Reviewed-By: Moshe Atlow 
Reviewed-By: Michaël Zasso 
Reviewed-By: Luigi Pinca 
Reviewed-By: Richard Lau 
--------------------------------------------------------------------------------
   ⚠  Commits were pushed since the last approving review:
   ⚠  - Merge branch 'main' into RafaelGSS-patch-2
   ℹ  This PR was created on Tue, 04 Jul 2023 02:33:49 GMT
   ✔  Approvals: 4
   ✔  - Moshe Atlow (@MoLow) (TSC): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512054953
   ✔  - Michaël Zasso (@targos) (TSC): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512152297
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512176825
   ✔  - Richard Lau (@richardlau) (TSC): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512459763
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/5471031542

@RafaelGSS RafaelGSS added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Jul 6, 2023
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Jul 6, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/48649
✔  Done loading data for nodejs/node/pull/48649
----------------------------------- PR info ------------------------------------
Title      doc: drop  of v20 changelog (#48649)
Author     Rafael Gonzaga  (@RafaelGSS)
Branch     RafaelGSS:RafaelGSS-patch-2 -> nodejs:main
Labels     release, commit-queue-squash
Commits    2
 - doc: drop  of v20 changelog
 - Merge branch 'main' into RafaelGSS-patch-2
Committers 1
 - GitHub 
PR-URL: https://github.com/nodejs/node/pull/48649
Reviewed-By: Moshe Atlow 
Reviewed-By: Michaël Zasso 
Reviewed-By: Luigi Pinca 
Reviewed-By: Richard Lau 
Reviewed-By: Marco Ippolito 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/48649
Reviewed-By: Moshe Atlow 
Reviewed-By: Michaël Zasso 
Reviewed-By: Luigi Pinca 
Reviewed-By: Richard Lau 
Reviewed-By: Marco Ippolito 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Tue, 04 Jul 2023 02:33:49 GMT
   ✔  Approvals: 5
   ✔  - Moshe Atlow (@MoLow) (TSC): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512054953
   ✔  - Michaël Zasso (@targos) (TSC): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512152297
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512176825
   ✔  - Richard Lau (@richardlau) (TSC): https://github.com/nodejs/node/pull/48649#pullrequestreview-1512459763
   ✔  - Marco Ippolito (@marco-ippolito): https://github.com/nodejs/node/pull/48649#pullrequestreview-1516668179
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/main up to date...
From https://github.com/nodejs/node
 * branch                  main       -> FETCH_HEAD
✔  origin/main is now up-to-date
- Downloading patch for 48649
From https://github.com/nodejs/node
 * branch                  refs/pull/48649/merge -> FETCH_HEAD
✔  Fetched commits as bc8750ec1903..44504c5e89f2
--------------------------------------------------------------------------------
Auto-merging doc/changelogs/CHANGELOG_V20.md
CONFLICT (content): Merge conflict in doc/changelogs/CHANGELOG_V20.md
error: could not apply cc14af67da... doc: drop  of v20 changelog
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
   ✘  Failed to apply patches
https://github.com/nodejs/node/actions/runs/5476809134

@richardlau
Copy link
Member

@RafaelGSS I suspect the merge commit prevents this being landable via automation.

@RafaelGSS
Copy link
Member Author

@RafaelGSS I suspect the merge commit prevents this being landable via automation.

I thought the squash would handle it. Let me fix, thx.

@RafaelGSS RafaelGSS added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Jul 6, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jul 6, 2023
@nodejs-github-bot nodejs-github-bot merged commit a1fe0d7 into nodejs:main Jul 6, 2023
17 checks passed
@nodejs-github-bot
Copy link
Collaborator

Landed in a1fe0d7

juanarbol pushed a commit that referenced this pull request Jul 13, 2023
@RafaelGSS @juanarbol
doc: drop <b> of v20 changelog
7daefae 
PR-URL: #48649
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
@juanarbol juanarbol mentioned this pull request Jul 13, 2023
Merged
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
@RafaelGSS @Ceres6
doc: drop <b> of v20 changelog
608ed36 
PR-URL: nodejs#48649
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
@RafaelGSS @Ceres6
doc: drop <b> of v20 changelog
9f6b969 
PR-URL: nodejs#48649
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
@ruyadorno ruyadorno added dont-land-on-v16.x dont-land-on-v18.x PRs that should not land on the v18.x-staging branch and should not be released in v18.x. labels Sep 11, 2023
@targos targos removed the release Issues and PRs related to Node.js releases. label May 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lpinca lpinca lpinca approved these changes

@targos targos targos approved these changes

@richardlau richardlau richardlau approved these changes

@MoLow MoLow MoLow approved these changes

@marco-ippolito marco-ippolito marco-ippolito approved these changes

Assignees
No one assigned
Labels
dont-land-on-v18.x PRs that should not land on the v18.x-staging branch and should not be released in v18.x.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@RafaelGSS @nodejs-github-bot @richardlau @lpinca @targos @MoLow @marco-ippolito @ruyadorno