GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — tools: do not use temp files when merging PRs by aduh95 · Pull Request #57790 · nodejs/node

Conversation

@aduh95

@aduh95 aduh95 commented Apr 8, 2025

Copy link
Copy Markdown
Contributor

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.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@aduh95
tools: do not use temp files when merging PRs
62fca43
@nodejs-github-bot

nodejs-github-bot commented Apr 8, 2025

Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/actions
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@nodejs-github-bot nodejs-github-bot added the tools Issues and PRs related to the tools directory. label Apr 8, 2025
LiviaMedeiros
LiviaMedeiros reviewed Apr 8, 2025
View reviewed changes
Comment thread tools/actions/commit-queue.sh Resolved

Uh oh!

There was an error while loading. Please reload this page.

aduh95
aduh95 commented Apr 8, 2025
View reviewed changes
Comment thread tools/actions/merge.sh Resolved

Uh oh!

There was an error while loading. Please reload this page.

@aduh95 @LiviaMedeiros
Apply suggestions from code review
a1779ce
Co-authored-by: Livia Medeiros <[email protected]>
LiviaMedeiros
LiviaMedeiros approved these changes Apr 8, 2025
View reviewed changes
@aduh95 aduh95 added the author ready PRs with CI started, the required approvals, and no outstanding review comments. label Apr 8, 2025
lpinca
lpinca approved these changes Apr 10, 2025
View reviewed changes
@aduh95 aduh95 added the commit-queue PRs queued for automated landing through the Commit Queue. label Apr 10, 2025
@nodejs-github-bot nodejs-github-bot added commit-queue-failed PRs whose Commit Queue landing failed and need manual intervention before retrying. and removed commit-queue PRs queued for automated landing through the Commit Queue. labels Apr 10, 2025
@nodejs-github-bot

nodejs-github-bot commented Apr 10, 2025

Copy link
Copy Markdown
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 <[email protected]>
 - GitHub <[email protected]>
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
--------------------------------------------------------------------------------
   ℹ  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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>

[detached HEAD fcf56ed002] tools: do not use temp files when merging PRs
Author: Antoine du Hamel <[email protected]>
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 <[email protected]>
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>

[detached HEAD cc77361292] Apply suggestions from code review
Author: Antoine du Hamel <[email protected]>
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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@LiviaMedeiros LiviaMedeiros added commit-queue PRs queued for automated landing through the Commit Queue. commit-queue-squash PRs the Commit Queue should land as one squashed commit. and removed commit-queue-failed PRs whose Commit Queue landing failed and need manual intervention before retrying. labels Apr 10, 2025
@nodejs-github-bot nodejs-github-bot removed the commit-queue PRs queued for automated landing through the Commit Queue. label Apr 10, 2025
@nodejs-github-bot
nodejs-github-bot merged commit d5b3dbb into nodejs:main Apr 10, 2025
@nodejs-github-bot

nodejs-github-bot commented Apr 10, 2025

Copy link
Copy Markdown
Collaborator

Landed in d5b3dbb

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@aduh95
aduh95 deleted the merge.sh-tmp-files branch April 11, 2025 07:37
RafaelGSS pushed a commit that referenced this pull request May 1, 2025
@aduh95 @RafaelGSS
tools: do not use temp files when merging PRs
43d326c
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@RafaelGSS RafaelGSS mentioned this pull request May 1, 2025
2025-05-06, Version 24.0.0 (Current) #57609
Merged
RafaelGSS pushed a commit that referenced this pull request May 2, 2025
@aduh95 @RafaelGSS
tools: do not use temp files when merging PRs
82bb228
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
aduh95 added a commit that referenced this pull request May 6, 2025
@aduh95
tools: do not use temp files when merging PRs
c99a184
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
RafaelGSS pushed a commit that referenced this pull request May 14, 2025
@aduh95 @RafaelGSS
tools: do not use temp files when merging PRs
8eb9930
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
aduh95 added a commit that referenced this pull request May 16, 2025
@aduh95
tools: do not use temp files when merging PRs
46000d9
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
aduh95 added a commit that referenced this pull request May 17, 2025
@aduh95
tools: do not use temp files when merging PRs
c0bf82a
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@github-actions github-actions Bot mentioned this pull request May 19, 2025
2025-05-21, Version 22.16.0 'Jod' (LTS) #58388
Merged
aduh95 added a commit that referenced this pull request May 19, 2025
@aduh95
tools: do not use temp files when merging PRs
3ae04c9
PR-URL: #57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@ghost ghost mentioned this pull request Jun 8, 2025
### Notable Changes autofix-ci/action#28
Closed
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
@LiviaMedeiros LiviaMedeiros LiviaMedeiros approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

author ready PRs with CI started, the required approvals, and no outstanding review comments. commit-queue-squash PRs the Commit Queue should land as one squashed commit. tools Issues and PRs related to the tools directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@aduh95 @nodejs-github-bot @lpinca @LiviaMedeiros
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.