diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 8ee338a805c..d78c4b56304 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -102,13 +102,13 @@ jobs: uses: actions/cache@v3.3.2 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 new file mode 100644 index 00000000000..c1c7f2ca3bf --- /dev/null +++ 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 index e3ec98c7ce8..bb2d437a134 100644 --- 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 index 6156f37f80e..e653068b897 100644 --- 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::