[PR #8140/d2ea8118 backport][3.10] Use NPM clean install and upgrade …

…node to v18 (#8150) **This is a backport of PR #8140 as merged into master (d2ea811).** Co-authored-by: Steve Repsher <[email protected]>
aio-libs · Feb 9, 2024 · eb397f3 · eb397f3
1 parent 1dc8a07
commit eb397f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -102,13 +102,13 @@ jobs:
       uses: actions/[email protected]
       id: cache
       with:
-        key: llhttp-${{ hashFiles('vendor/llhttp/package.json', 'vendor/llhttp/src/**/*') }}
+        key: llhttp-${{ hashFiles('vendor/llhttp/package*.json', 'vendor/llhttp/src/**/*') }}
         path:  vendor/llhttp/build
     - name: Setup NodeJS
       if: steps.cache.outputs.cache-hit != 'true'
       uses: actions/setup-node@v4
       with:
-        node-version: '14'
+        node-version: 18
     - name: Generate llhttp sources
       if: steps.cache.outputs.cache-hit != 'true'
       run: |

diff --git a/CHANGES/8116.contrib.rst b/CHANGES/8116.contrib.rst
@@ -0,0 +1 @@
+Updated CI and documentation to use NPM clean install and upgrade node to version 18 -- by :user:`steverep`.
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ aiohttp/%.c: aiohttp/%.pyx $(call to-hash,$(CYS)) aiohttp/_find_header.c
 	cython -3 -o $@ $< -I aiohttp -Werror
 
 vendor/llhttp/node_modules: vendor/llhttp/package.json
-	cd vendor/llhttp; npm install
+	cd vendor/llhttp; npm ci
 
 .llhttp-gen: vendor/llhttp/node_modules
 	$(MAKE) -C vendor/llhttp generate

diff --git a/vendor/README.rst b/vendor/README.rst
@@ -12,7 +12,7 @@ newer release, add ``--remote``)::
 Then build ``llhttp``::
 
     cd vendor/llhttp/
-    npm install
+    npm ci
     make
 
 Then build our parser::
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Updated CI and documentation to use NPM clean install and upgrade node to version 18 -- by :user:`steverep`.