Skip to content

Conversation

ASPang
Copy link

@ASPang ASPang commented Sep 23, 2023

No description provided.

@nodejs-github-bot nodejs-github-bot added needs-ci PRs that need a full CI run. test Issues and PRs related to the tests. labels Sep 23, 2023
@ASPang
Copy link
Author

ASPang commented Sep 23, 2023

Part of GHC 2023 opensource day

@tniessen tniessen added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Sep 23, 2023
Co-authored-by: Tobias Nießen <tniessen@tnie.de>
@lpinca lpinca added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 21, 2023
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 21, 2023
@nodejs-github-bot
Copy link
Collaborator

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Nov 2, 2023

@jasnell jasnell added the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 11, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 11, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/49800
✔  Done loading data for nodejs/node/pull/49800
----------------------------------- PR info ------------------------------------
Title      test: replace forEach with for of (#49800)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     ASPang:test-replace-foreach -> nodejs:main
Labels     test, code-and-learn, needs-ci
Commits    2
 - test: replace forEach with for of
 - Update test/parallel/test-trace-events-vm.js
Committers 2
 - ASPang 
 - GitHub 
PR-URL: https://github.com/nodejs/node/pull/49800
Reviewed-By: Luigi Pinca 
Reviewed-By: Yongsheng Zhang 
Reviewed-By: James M Snell 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/49800
Reviewed-By: Luigi Pinca 
Reviewed-By: Yongsheng Zhang 
Reviewed-By: James M Snell 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Sat, 23 Sep 2023 00:00:28 GMT
   ✔  Approvals: 3
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/49800#pullrequestreview-1691267756
   ✔  - Yongsheng Zhang (@ZYSzys): https://github.com/nodejs/node/pull/49800#pullrequestreview-1691415212
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/49800#pullrequestreview-1702815805
   ℹ  This PR is being fast-tracked because it is from a Code and Learn event
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2023-11-02T07:47:17Z: https://ci.nodejs.org/job/node-test-pull-request/55412/
- Querying data for job/node-test-pull-request/55412/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  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 49800
From https://github.com/nodejs/node
 * branch                  refs/pull/49800/merge -> FETCH_HEAD
✔  Fetched commits as 6b27f5b09eda..d0320f0ed9e8
--------------------------------------------------------------------------------
[main ec19b6c9de] test: replace forEach with for of
 Author: ASPang 
 Date: Fri Sep 22 19:34:35 2023 -0400
 1 file changed, 2 insertions(+), 2 deletions(-)
[main e97ba07938] Update test/parallel/test-trace-events-vm.js
 Author: Luigi Pinca 
 Date: Sat Oct 21 16:30:00 2023 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
   ✔  Patches applied
There are 2 commits in the PR. Attempting autorebase.
Rebasing (2/4)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
test: replace forEach with for of

PR-URL: #49800
Reviewed-By: Luigi Pinca luigipinca@gmail.com
Reviewed-By: Yongsheng Zhang zyszys98@gmail.com
Reviewed-By: James M Snell jasnell@gmail.com

[detached HEAD d3ceeb273d] test: replace forEach with for of
Author: ASPang ASPang@users.noreply.github.com
Date: Fri Sep 22 19:34:35 2023 -0400
1 file changed, 2 insertions(+), 2 deletions(-)
Rebasing (3/4)
Rebasing (4/4)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
Update test/parallel/test-trace-events-vm.js

Co-authored-by: Tobias Nießen tniessen@tnie.de
PR-URL: #49800
Reviewed-By: Luigi Pinca luigipinca@gmail.com
Reviewed-By: Yongsheng Zhang zyszys98@gmail.com
Reviewed-By: James M Snell jasnell@gmail.com

[detached HEAD e4dc76859c] Update test/parallel/test-trace-events-vm.js
Author: Luigi Pinca luigipinca@gmail.com
Date: Sat Oct 21 16:30:00 2023 +0200
1 file changed, 1 insertion(+), 1 deletion(-)

Successfully rebased and updated refs/heads/main.

ℹ Add commit-queue-squash label to land the PR as one commit, or commit-queue-rebase to land as separate commits.

https://github.com/nodejs/node/actions/runs/6835327454

@nodejs-github-bot nodejs-github-bot added the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Nov 11, 2023
@marco-ippolito marco-ippolito added commit-queue Add this label to land a pull request using GitHub Actions. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Nov 20, 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 Nov 20, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/49800
✔  Done loading data for nodejs/node/pull/49800
----------------------------------- PR info ------------------------------------
Title      test: replace forEach with for of (#49800)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     ASPang:test-replace-foreach -> nodejs:main
Labels     test, code-and-learn, needs-ci, commit-queue-squash
Commits    2
 - test: replace forEach with for of
 - Update test/parallel/test-trace-events-vm.js
Committers 2
 - ASPang 
 - GitHub 
PR-URL: https://github.com/nodejs/node/pull/49800
Reviewed-By: Luigi Pinca 
Reviewed-By: Yongsheng Zhang 
Reviewed-By: James M Snell 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/49800
Reviewed-By: Luigi Pinca 
Reviewed-By: Yongsheng Zhang 
Reviewed-By: James M Snell 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Sat, 23 Sep 2023 00:00:28 GMT
   ✔  Approvals: 3
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/49800#pullrequestreview-1691267756
   ✔  - Yongsheng Zhang (@ZYSzys): https://github.com/nodejs/node/pull/49800#pullrequestreview-1691415212
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/49800#pullrequestreview-1702815805
   ℹ  This PR is being fast-tracked because it is from a Code and Learn event
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2023-11-11T16:24:58Z: https://ci.nodejs.org/job/node-test-pull-request/55412/
- Querying data for job/node-test-pull-request/55412/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  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 49800
From https://github.com/nodejs/node
 * branch                  refs/pull/49800/merge -> FETCH_HEAD
✔  Fetched commits as e870941fa4d9..d0320f0ed9e8
--------------------------------------------------------------------------------
Auto-merging test/parallel/test-trace-events-vm.js
CONFLICT (content): Merge conflict in test/parallel/test-trace-events-vm.js
error: could not apply 83b8867c46... test: replace forEach with for of
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/6932256481

@marco-ippolito marco-ippolito 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 Nov 21, 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 Nov 21, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/49800
✔  Done loading data for nodejs/node/pull/49800
----------------------------------- PR info ------------------------------------
Title      test: replace forEach with for of (#49800)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     ASPang:test-replace-foreach -> nodejs:main
Labels     test, code-and-learn, needs-ci, commit-queue-squash
Commits    2
 - test: replace forEach with for of
 - Update test/parallel/test-trace-events-vm.js
Committers 2
 - ASPang 
 - GitHub 
PR-URL: https://github.com/nodejs/node/pull/49800
Reviewed-By: Luigi Pinca 
Reviewed-By: Yongsheng Zhang 
Reviewed-By: James M Snell 
Reviewed-By: Marco Ippolito 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/49800
Reviewed-By: Luigi Pinca 
Reviewed-By: Yongsheng Zhang 
Reviewed-By: James M Snell 
Reviewed-By: Marco Ippolito 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Sat, 23 Sep 2023 00:00:28 GMT
   ✔  Approvals: 4
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/49800#pullrequestreview-1691267756
   ✔  - Yongsheng Zhang (@ZYSzys): https://github.com/nodejs/node/pull/49800#pullrequestreview-1691415212
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/49800#pullrequestreview-1702815805
   ✔  - Marco Ippolito (@marco-ippolito): https://github.com/nodejs/node/pull/49800#pullrequestreview-1741942419
   ℹ  This PR is being fast-tracked because it is from a Code and Learn event
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2023-11-20T15:31:03Z: https://ci.nodejs.org/job/node-test-pull-request/55412/
- Querying data for job/node-test-pull-request/55412/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  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 49800
From https://github.com/nodejs/node
 * branch                  refs/pull/49800/merge -> FETCH_HEAD
✔  Fetched commits as 51abedecc55f..d0320f0ed9e8
--------------------------------------------------------------------------------
Auto-merging test/parallel/test-trace-events-vm.js
CONFLICT (content): Merge conflict in test/parallel/test-trace-events-vm.js
error: could not apply 83b8867c46... test: replace forEach with for of
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/6944049896

@tniessen
Copy link
Member

There is a merge conflict according to the commit queue, but not according to the GitHub UI. Perhaps it would be resolved by a 3-way merge?

@aduh95
Copy link
Contributor

aduh95 commented May 5, 2024

Superseded by #50596

@aduh95 aduh95 closed this May 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. commit-queue-failed An error occurred while landing this pull request using GitHub Actions. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. needs-ci PRs that need a full CI run. test Issues and PRs related to the tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants