Skip to content

tools: do not use temp files when merging PRs #57790

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

Merged
merged 2 commits into from
Apr 10, 2025

Conversation

aduh95
Copy link
Contributor

@aduh95 aduh95 commented Apr 8, 2025

IIRC the script was written like this so it could work even without set -xe while maintaining a verbose enough output to allow debugging. However, with set -e, it's kind of an unnecessary step, and it's a bit annoying to have those temp files popping up when running the scripts.

@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/actions

@nodejs-github-bot nodejs-github-bot added the tools Issues and PRs related to the tools directory. label Apr 8, 2025
Co-authored-by: Livia Medeiros <livia@cirno.name>
@aduh95 aduh95 added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 8, 2025
@aduh95 aduh95 added the commit-queue Add this label to land a pull request using GitHub Actions. label Apr 10, 2025
@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 Apr 10, 2025
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/57790
✔  Done loading data for nodejs/node/pull/57790
----------------------------------- PR info ------------------------------------
Title      tools: do not use temp files when merging PRs (#57790)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     aduh95:merge.sh-tmp-files -> nodejs:main
Labels     tools, author ready
Commits    2
 - tools: do not use temp files when merging PRs
 - Apply suggestions from code review
Committers 2
 - Antoine du Hamel <duhamelantoine1995@gmail.com>
 - GitHub <noreply@github.com>
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
--------------------------------------------------------------------------------
   ℹ  This PR was created on Tue, 08 Apr 2025 11:37:11 GMT
   ✔  Approvals: 2
   ✔  - LiviaMedeiros (@LiviaMedeiros): https://github.com/nodejs/node/pull/57790#pullrequestreview-2751143697
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/57790#pullrequestreview-2757710837
   ✔  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 57790
From https://github.com/nodejs/node
 * branch                  refs/pull/57790/merge -> FETCH_HEAD
✔  Fetched commits as f692878dec63..a1779ce5aa2d
--------------------------------------------------------------------------------
[main f84b17bb86] tools: do not use temp files when merging PRs
 Author: Antoine du Hamel <duhamelantoine1995@gmail.com>
 Date: Tue Apr 8 00:18:57 2025 +0200
 2 files changed, 16 insertions(+), 30 deletions(-)
[main a33199c1c8] Apply suggestions from code review
 Author: Antoine du Hamel <duhamelantoine1995@gmail.com>
 Date: Tue Apr 8 16:37:39 2025 +0200
 2 files changed, 2 insertions(+), 2 deletions(-)
   ✔  Patches applied
There are 2 commits in the PR. Attempting autorebase.
Rebasing (2/4)
Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
tools: do not use temp files when merging PRs

PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

[detached HEAD fcf56ed002] tools: do not use temp files when merging PRs
Author: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue Apr 8 00:18:57 2025 +0200
2 files changed, 16 insertions(+), 30 deletions(-)
Rebasing (3/4)
Rebasing (4/4)
Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
Apply suggestions from code review

Co-authored-by: Livia Medeiros <livia@cirno.name>
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

[detached HEAD cc77361292] Apply suggestions from code review
Author: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue Apr 8 16:37:39 2025 +0200
2 files changed, 2 insertions(+), 2 deletions(-)
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/14390757413

@LiviaMedeiros LiviaMedeiros 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 Apr 10, 2025
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Apr 10, 2025
@nodejs-github-bot nodejs-github-bot merged commit d5b3dbb into nodejs:main Apr 10, 2025
37 checks passed
@nodejs-github-bot
Copy link
Collaborator

Landed in d5b3dbb

@aduh95 aduh95 deleted the merge.sh-tmp-files branch April 11, 2025 07:37
JonasBa pushed a commit to JonasBa/node that referenced this pull request Apr 11, 2025
PR-URL: nodejs#57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
RafaelGSS pushed a commit that referenced this pull request May 1, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
RafaelGSS pushed a commit that referenced this pull request May 2, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
aduh95 added a commit that referenced this pull request May 6, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
RafaelGSS pushed a commit that referenced this pull request May 14, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
aduh95 added a commit that referenced this pull request May 16, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
aduh95 added a commit that referenced this pull request May 17, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
aduh95 added a commit that referenced this pull request May 17, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
aduh95 added a commit that referenced this pull request May 17, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
aduh95 added a commit that referenced this pull request May 19, 2025
PR-URL: #57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants