Skip to content

Commit b04a6c2

Browse files
authored
Merge pull request #668 from clearlydefined/jamiemagee/upgrade-node24-trixie
2 parents 21a1b2c + 8c7edea commit b04a6c2

7 files changed

Lines changed: 1097 additions & 2173 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-node@v6
2525
with:
26-
node-version: 18
26+
node-version: 24
2727
cache: 'npm'
2828

2929
- name: Install dependencies

‎DevDockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
22
# SPDX-License-Identifier: MIT
33

4-
FROM node:18-bullseye
4+
FROM node:24-trixie
55
ENV APPDIR=/opt/service
66

77
# Set environment variables from build arguments
@@ -22,9 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends --no-install-su
2222

2323
# Scancode
2424
ARG SCANCODE_VERSION="32.4.1"
25-
RUN pip3 install --upgrade pip setuptools wheel && \
26-
curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt && \
27-
pip3 install --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION && \
25+
RUN curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt && \
26+
pip3 install --break-system-packages --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION && \
2827
rm requirements.txt && \
2928
scancode-reindex-licenses && \
3029
scancode --version
@@ -41,8 +40,8 @@ RUN gem install nokogiri:1.16.0 --no-document && \
4140
gem install licensee:9.16.1 --no-document
4241

4342
# REUSE
44-
RUN pip3 install setuptools
45-
RUN pip3 install reuse==3.0.1
43+
RUN pip3 install --break-system-packages setuptools
44+
RUN pip3 install --break-system-packages reuse==3.0.1
4645

4746
RUN git config --global --add safe.directory '*'
4847

‎Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
22
# SPDX-License-Identifier: MIT
33

4-
FROM node:18-bullseye
4+
FROM node:24-trixie
55
ENV APPDIR=/opt/service
66

77
# Set environment variables from build arguments
@@ -20,9 +20,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends --no-install-su
2020

2121
# Scancode
2222
ARG SCANCODE_VERSION="32.4.1"
23-
RUN pip3 install --upgrade pip setuptools wheel && \
24-
curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt && \
25-
pip3 install --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION && \
23+
RUN curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt && \
24+
pip3 install --break-system-packages --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION && \
2625
rm requirements.txt && \
2726
scancode-reindex-licenses && \
2827
scancode --version
@@ -39,8 +38,8 @@ RUN gem install nokogiri:1.16.0 --no-document && \
3938
gem install licensee:9.16.1 --no-document
4039

4140
# REUSE
42-
RUN pip3 install setuptools
43-
RUN pip3 install reuse==3.0.1
41+
RUN pip3 install --break-system-packages setuptools
42+
RUN pip3 install --break-system-packages reuse==3.0.1
4443

4544
# Crawler config
4645
ENV CRAWLER_DEADLETTER_PROVIDER=cd(azblob)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Due to an issue with ScanCode's install configuration on Windows, you may need t
2727

2828
## Setup for running tests
2929

30-
If you are just interested in running the tests for the crawler then you need to be using Node v18.20.8 on your local system to get `npm install` and the tests to run safely. This will be fixed as we upgrade the dependencies but for now this is the best solution. If you are using [nvm](https://github.com/nvm-sh/nvm) you can follow the instructions below, using the lowest working node version, to get things setup to run tests.
30+
If you are just interested in running the tests for the crawler then you need to be using Node v24 on your local system to get `npm install` and the tests to run safely. This will be fixed as we upgrade the dependencies but for now this is the best solution. If you are using [nvm](https://github.com/nvm-sh/nvm) you can follow the instructions below, using the lowest working node version, to get things setup to run tests.
3131

3232
1. Clone this repo
3333
2. cd into the `crawler` directory
34-
3. run `nvm install v18.20.8; nvm use v18.20.8` to instal the correct node version
34+
3. run `nvm install v24; nvm use v24` to install the correct node version
3535
4. run `npm run test` and profit
3636

3737
## Queuing work with the crawler

0 commit comments

Comments
 (0)