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

tools: change minimatch install strategy #50476

Merged
merged 3 commits into from
Nov 13, 2023
Merged

tools: change minimatch install strategy #50476

merged 3 commits into from
Nov 13, 2023

Conversation

marco-ippolito
Copy link
Member

Refs: nodejs/security-wg#1037
It makes build process repeatable and keeps track of package lock

@nodejs-github-bot nodejs-github-bot added dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. labels Oct 30, 2023
@marco-ippolito marco-ippolito added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 31, 2023
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 31, 2023
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/55343/

@marco-ippolito marco-ippolito added 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-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. labels Oct 31, 2023
@marco-ippolito marco-ippolito reopened this Nov 6, 2023
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/55474/

This was referenced Nov 8, 2023
Open
Open
Open
Open
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Nov 11, 2023 •
edited by jasnell
Loading

CI: https://ci.nodejs.org/job/node-test-pull-request/55577/ 💛

@jasnell jasnell added the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 12, 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 12, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/50476
✔  Done loading data for nodejs/node/pull/50476
----------------------------------- PR info ------------------------------------
Title      tools: change minimatch install strategy (#50476)
Author     Marco Ippolito  (@marco-ippolito)
Branch     marco-ippolito:feat/minimatch-update -> nodejs:main
Labels     needs-ci, dependencies
Commits    3
 - tools: change minimatch install strategy
 - fix: header broke everything
 - fix
Committers 1
 - Marco Ippolito 
PR-URL: https://github.com/nodejs/node/pull/50476
Refs: https://github.com/nodejs/security-wg/issues/1037
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/50476
Refs: https://github.com/nodejs/security-wg/issues/1037
--------------------------------------------------------------------------------
   ℹ  This PR was created on Mon, 30 Oct 2023 15:10:36 GMT
   ✘  Approvals: 0
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2023-11-11T19:17:40Z: https://ci.nodejs.org/job/node-test-pull-request/55577/
- Querying data for job/node-test-pull-request/55577/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/6840374876

@jasnell jasnell 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 12, 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 12, 2023
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/50476
✔  Done loading data for nodejs/node/pull/50476
----------------------------------- PR info ------------------------------------
Title      tools: change minimatch install strategy (#50476)
Author     Marco Ippolito  (@marco-ippolito)
Branch     marco-ippolito:feat/minimatch-update -> nodejs:main
Labels     needs-ci, dependencies
Commits    3
 - tools: change minimatch install strategy
 - fix: header broke everything
 - fix
Committers 1
 - Marco Ippolito 
PR-URL: https://github.com/nodejs/node/pull/50476
Refs: https://github.com/nodejs/security-wg/issues/1037
Reviewed-By: James M Snell 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/50476
Refs: https://github.com/nodejs/security-wg/issues/1037
Reviewed-By: James M Snell 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Mon, 30 Oct 2023 15:10:36 GMT
   ✔  Approvals: 1
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/50476#pullrequestreview-1726228816
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2023-11-12T11:24:44Z: https://ci.nodejs.org/job/node-test-pull-request/55577/
- Querying data for job/node-test-pull-request/55577/
   ✔  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 50476
From https://github.com/nodejs/node
 * branch                  refs/pull/50476/merge -> FETCH_HEAD
✔  Fetched commits as 242cbd7d1a92..2080d72dc2bb
--------------------------------------------------------------------------------
[main 9227968bab] tools: change minimatch install strategy
 Author: Marco Ippolito 
 Date: Mon Oct 30 14:39:43 2023 +0200
 64 files changed, 6272 insertions(+), 670 deletions(-)
 rename deps/minimatch/{src => }/README.md (100%)
 rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.d.ts (100%)
 rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.js (100%)
 rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.js.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/ast.d.ts (100%)
 rename deps/minimatch/{src => }/dist/cjs/ast.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/ast.js (100%)
 rename deps/minimatch/{src => }/dist/cjs/ast.js.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/brace-expressions.d.ts (100%)
 rename deps/minimatch/{src => }/dist/cjs/brace-expressions.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/brace-expressions.js (100%)
 rename deps/minimatch/{src => }/dist/cjs/brace-expressions.js.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/escape.d.ts (100%)
 rename deps/minimatch/{src => }/dist/cjs/escape.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/escape.js (100%)
 rename deps/minimatch/{src => }/dist/cjs/escape.js.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/index.d.ts (100%)
 rename deps/minimatch/{src => }/dist/cjs/index.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/index.js (100%)
 rename deps/minimatch/{src => }/dist/cjs/index.js.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/package.json (100%)
 rename deps/minimatch/{src => }/dist/cjs/unescape.d.ts (100%)
 rename deps/minimatch/{src => }/dist/cjs/unescape.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/cjs/unescape.js (100%)
 rename deps/minimatch/{src => }/dist/cjs/unescape.js.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.d.ts (100%)
 rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.js (100%)
 rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.js.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/ast.d.ts (100%)
 rename deps/minimatch/{src => }/dist/mjs/ast.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/ast.js (100%)
 rename deps/minimatch/{src => }/dist/mjs/ast.js.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/brace-expressions.d.ts (100%)
 rename deps/minimatch/{src => }/dist/mjs/brace-expressions.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/brace-expressions.js (100%)
 rename deps/minimatch/{src => }/dist/mjs/brace-expressions.js.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/escape.d.ts (100%)
 rename deps/minimatch/{src => }/dist/mjs/escape.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/escape.js (100%)
 rename deps/minimatch/{src => }/dist/mjs/escape.js.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/index.d.ts (100%)
 rename deps/minimatch/{src => }/dist/mjs/index.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/index.js (100%)
 rename deps/minimatch/{src => }/dist/mjs/index.js.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/package.json (100%)
 rename deps/minimatch/{src => }/dist/mjs/unescape.d.ts (100%)
 rename deps/minimatch/{src => }/dist/mjs/unescape.d.ts.map (100%)
 rename deps/minimatch/{src => }/dist/mjs/unescape.js (100%)
 rename deps/minimatch/{src => }/dist/mjs/unescape.js.map (100%)
 create mode 100644 deps/minimatch/package-lock.json
 rename deps/minimatch/{src => }/package.json (94%)
 delete mode 100644 deps/minimatch/src/LICENSE
 delete mode 100644 deps/minimatch/src/node_modules/balanced-match/LICENSE.md
 delete mode 100644 deps/minimatch/src/node_modules/balanced-match/README.md
 delete mode 100644 deps/minimatch/src/node_modules/balanced-match/index.js
 delete mode 100644 deps/minimatch/src/node_modules/balanced-match/package.json
 delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/LICENSE
 delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/README.md
 delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/index.js
 delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/package.json
[main 88b29a0fc1] fix: header broke everything
 Author: Marco Ippolito 
 Date: Mon Oct 30 17:42:00 2023 +0200
 2 files changed, 6 deletions(-)
[main a252c8c9d0] fix
 Author: Marco Ippolito 
 Date: Tue Oct 31 11:13:55 2023 +0200
 1 file changed, 1 deletion(-)
   ✔  Patches applied
There are 3 commits in the PR. Attempting autorebase.
Rebasing (2/6)

Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

tools: change minimatch install strategy


PR-URL: #50476

Refs: nodejs/security-wg#1037

Reviewed-By: James M Snell [email protected]


[detached HEAD 5f7b8a9c69] tools: change minimatch install strategy

Author: Marco Ippolito [email protected]

Date: Mon Oct 30 14:39:43 2023 +0200

64 files changed, 6272 insertions(+), 670 deletions(-)

rename deps/minimatch/{src => }/README.md (100%)

rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.d.ts (100%)

rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.js (100%)

rename deps/minimatch/{src => }/dist/cjs/assert-valid-pattern.js.map (100%)

rename deps/minimatch/{src => }/dist/cjs/ast.d.ts (100%)

rename deps/minimatch/{src => }/dist/cjs/ast.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/cjs/ast.js (100%)

rename deps/minimatch/{src => }/dist/cjs/ast.js.map (100%)

rename deps/minimatch/{src => }/dist/cjs/brace-expressions.d.ts (100%)

rename deps/minimatch/{src => }/dist/cjs/brace-expressions.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/cjs/brace-expressions.js (100%)

rename deps/minimatch/{src => }/dist/cjs/brace-expressions.js.map (100%)

rename deps/minimatch/{src => }/dist/cjs/escape.d.ts (100%)

rename deps/minimatch/{src => }/dist/cjs/escape.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/cjs/escape.js (100%)

rename deps/minimatch/{src => }/dist/cjs/escape.js.map (100%)

rename deps/minimatch/{src => }/dist/cjs/index.d.ts (100%)

rename deps/minimatch/{src => }/dist/cjs/index.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/cjs/index.js (100%)

rename deps/minimatch/{src => }/dist/cjs/index.js.map (100%)

rename deps/minimatch/{src => }/dist/cjs/package.json (100%)

rename deps/minimatch/{src => }/dist/cjs/unescape.d.ts (100%)

rename deps/minimatch/{src => }/dist/cjs/unescape.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/cjs/unescape.js (100%)

rename deps/minimatch/{src => }/dist/cjs/unescape.js.map (100%)

rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.d.ts (100%)

rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.js (100%)

rename deps/minimatch/{src => }/dist/mjs/assert-valid-pattern.js.map (100%)

rename deps/minimatch/{src => }/dist/mjs/ast.d.ts (100%)

rename deps/minimatch/{src => }/dist/mjs/ast.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/mjs/ast.js (100%)

rename deps/minimatch/{src => }/dist/mjs/ast.js.map (100%)

rename deps/minimatch/{src => }/dist/mjs/brace-expressions.d.ts (100%)

rename deps/minimatch/{src => }/dist/mjs/brace-expressions.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/mjs/brace-expressions.js (100%)

rename deps/minimatch/{src => }/dist/mjs/brace-expressions.js.map (100%)

rename deps/minimatch/{src => }/dist/mjs/escape.d.ts (100%)

rename deps/minimatch/{src => }/dist/mjs/escape.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/mjs/escape.js (100%)

rename deps/minimatch/{src => }/dist/mjs/escape.js.map (100%)

rename deps/minimatch/{src => }/dist/mjs/index.d.ts (100%)

rename deps/minimatch/{src => }/dist/mjs/index.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/mjs/index.js (100%)

rename deps/minimatch/{src => }/dist/mjs/index.js.map (100%)

rename deps/minimatch/{src => }/dist/mjs/package.json (100%)

rename deps/minimatch/{src => }/dist/mjs/unescape.d.ts (100%)

rename deps/minimatch/{src => }/dist/mjs/unescape.d.ts.map (100%)

rename deps/minimatch/{src => }/dist/mjs/unescape.js (100%)

rename deps/minimatch/{src => }/dist/mjs/unescape.js.map (100%)

create mode 100644 deps/minimatch/package-lock.json

rename deps/minimatch/{src => }/package.json (94%)

delete mode 100644 deps/minimatch/src/LICENSE

delete mode 100644 deps/minimatch/src/node_modules/balanced-match/LICENSE.md

delete mode 100644 deps/minimatch/src/node_modules/balanced-match/README.md

delete mode 100644 deps/minimatch/src/node_modules/balanced-match/index.js

delete mode 100644 deps/minimatch/src/node_modules/balanced-match/package.json

delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/LICENSE

delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/README.md

delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/index.js

delete mode 100644 deps/minimatch/src/node_modules/brace-expansion/package.json

Rebasing (3/6)

Rebasing (4/6)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fix: header broke everything


PR-URL: #50476

Refs: nodejs/security-wg#1037

Reviewed-By: James M Snell [email protected]


[detached HEAD 97de5f7430] fix: header broke everything

Author: Marco Ippolito [email protected]

Date: Mon Oct 30 17:42:00 2023 +0200

2 files changed, 6 deletions(-)

Rebasing (5/6)

Rebasing (6/6)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fix


PR-URL: #50476

Refs: nodejs/security-wg#1037

Reviewed-By: James M Snell [email protected]


[detached HEAD d048eb3cbe] fix

Author: Marco Ippolito [email protected]

Date: Tue Oct 31 11:13:55 2023 +0200

1 file changed, 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/6840406687

@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 13, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 13, 2023
@nodejs-github-bot nodejs-github-bot merged commit 0304da2 into nodejs:main Nov 13, 2023
83 checks passed
@nodejs-github-bot
Copy link
Collaborator

Landed in 0304da2

targos pushed a commit that referenced this pull request Nov 23, 2023
@marco-ippolito @targos
tools: change minimatch install strategy
c494838 
PR-URL: #50476
Refs: nodejs/security-wg#1037
Reviewed-By: James M Snell <[email protected]>
martenrichter pushed a commit to martenrichter/node that referenced this pull request Nov 26, 2023
@marco-ippolito @martenrichter
tools: change minimatch install strategy
9457199 
PR-URL: nodejs#50476
Refs: nodejs/security-wg#1037
Reviewed-By: James M Snell <[email protected]>
@RafaelGSS RafaelGSS mentioned this pull request Nov 28, 2023
Merged
UlisesGascon pushed a commit that referenced this pull request Dec 11, 2023
@marco-ippolito @UlisesGascon
tools: change minimatch install strategy
8ce6403 
PR-URL: #50476
Refs: nodejs/security-wg#1037
Reviewed-By: James M Snell <[email protected]>
@UlisesGascon UlisesGascon mentioned this pull request Dec 12, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MoLow MoLow MoLow left review comments

@jasnell jasnell jasnell approved these changes

Assignees
No one assigned
Labels
commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@marco-ippolito @nodejs-github-bot @jasnell @MoLow