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.

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

Use NPM clean install and upgrade node to v18 #8140

Merged
merged 1 commit into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,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/**/*') }}
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
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: |
Expand Down
1 change: 1 addition & 0 deletions CHANGES/8116.contrib.rst
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`.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vendor/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ newer release, add ``--remote``)::
Then build ``llhttp``::

cd vendor/llhttp/
npm install
npm ci
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
make

Then build our parser::
Expand Down
Loading