Skip to content

Commit 7da3fdb

Browse files
committed
drop! update V8
1 parent b30042f commit 7da3fdb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/test-shared.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,12 @@ jobs:
6969
with:
7070
persist-credentials: false
7171

72-
- name: Patch npm gyp (to be able to build addons for the tests)
72+
- name: Pull V8 update PR
7373
if: ${{ github.event_name != 'workflow_dispatch' }}
7474
run: |
75-
curl -L https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.diff \
76-
| git apply --directory=deps/npm/node_modules/node-gyp/gyp
77-
git add deps/npm/node_modules/node-gyp/gyp
7875
git config --local user.email "[email protected]"
7976
git config --local user.name "Node.js GitHub Bot"
80-
git commit --fixup HEAD
77+
curl -L https://github.com/nodejs/node/pull/60111.patch | git am
8178
8279
- name: Make tarball
8380
if: ${{ github.event_name != 'workflow_dispatch' }}
@@ -134,11 +131,14 @@ jobs:
134131
persist-credentials: false
135132
fetch-depth: 2
136133

137-
- name: Validate PR head and roll back to base commit
134+
- name: Validate PR head, roll back to base commit, and pull V8 update PR
138135
if: ${{ github.event_name == 'workflow_dispatch' }}
139136
run: |
140137
[ "$(git rev-parse HEAD^2)" = "$EXPECTED_SHA" ]
141138
git reset HEAD^ --hard
139+
git config --local user.email "[email protected]"
140+
git config --local user.name "Node.js GitHub Bot"
141+
curl -L https://github.com/nodejs/node/pull/60111.patch | git am
142142
env:
143143
EXPECTED_SHA: ${{ inputs.commit }}
144144

@@ -184,7 +184,7 @@ jobs:
184184
if: ${{ github.event_name == 'workflow_dispatch' }}
185185
run: |
186186
mv out/Release/node base_node
187-
git reset FETCH_HEAD --hard
187+
git merge FETCH_HEAD --no-edit
188188
nix-shell \
189189
-I nixpkgs=./nixpkgs.nix \
190190
--pure \

0 commit comments

Comments
 (0)