Skip to content

Commit 7d69beb

Browse files
committed
mk: upgrade to Node 26.x and clang-format-20
1 parent 11404fe commit 7d69beb

13 files changed

Lines changed: 67 additions & 52 deletions

File tree

.github/workflows/build.yml

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,24 @@ jobs:
1010
build:
1111
strategy:
1212
fail-fast: false
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
16-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
16+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
1717
with:
1818
path: ~/.local/share/pnpm/store
1919
key: build-${{ hashFiles('**/package.json') }}
20-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
20+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2121
with:
2222
node-version: 24
23-
- run: corepack pnpm install
23+
- run: |
24+
npm install -g corepack
25+
corepack pnpm install
2426
env:
2527
PUPPETEER_SKIP_DOWNLOAD: true
2628
- run: corepack pnpm build
2729
- run: corepack pnpm lint
28-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
30+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
2931
with:
3032
name: build-lib
3133
path: pkg/*/lib/
@@ -35,33 +37,35 @@ jobs:
3537
strategy:
3638
matrix:
3739
include:
38-
- node: 25
40+
- node: 26
3941
test: test
4042
- node: 24
4143
test: cover
4244
fail-fast: false
4345
name: unittest (${{ matrix.node }})
44-
runs-on: ubuntu-22.04
46+
runs-on: ubuntu-24.04
4547
steps:
4648
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
49+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4850
with:
4951
path: ~/.local/share/pnpm/store
5052
key: unittest-${{ matrix.node }}-${{ hashFiles('**/package.json') }}
51-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
53+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
5254
with:
5355
node-version: ${{ matrix.node }}
5456
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
5557
with:
5658
python-version: '3.12'
5759
- name: Install dependencies
5860
run: |
59-
echo "deb [arch=amd64 trusted=yes] https://nfd-nightly-apt.ndn.today/ubuntu jammy main" \
61+
echo "deb [arch=amd64 trusted=yes] https://nfd-nightly-apt.ndn.today/ubuntu noble main" \
6062
| sudo tee /etc/apt/sources.list.d/nfd-nightly.list
6163
sudo apt-get update
6264
sudo apt-get install --no-install-recommends ndnsec
6365
pip install git+https://github.com/UCLA-IRL/ndn-python-repo@991ed9de02add3c1aea9994da573da9ae3ce7c67
64-
- run: corepack pnpm install
66+
- run: |
67+
npm install -g corepack
68+
corepack pnpm install
6569
env:
6670
PUPPETEER_SKIP_DOWNLOAD: true
6771
- run: corepack pnpm ${{ matrix.test }}
@@ -74,27 +78,33 @@ jobs:
7478
integ:
7579
strategy:
7680
fail-fast: false
77-
runs-on: ubuntu-22.04
81+
runs-on: ubuntu-24.04
7882
steps:
83+
- name: Disable Ubuntu AppArmor Namespace Restrictions
84+
run: |
85+
sudo sysctl -w kernel.apparmor_restrict_unprivileged_unconfined=0 || true
86+
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true
7987
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
80-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
88+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
8189
with:
8290
path: |
8391
~/.local/share/pnpm/store
8492
~/.cache/puppeteer
8593
key: integ-${{ hashFiles('**/package.json') }}
86-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
94+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
8795
with:
8896
node-version: 24
8997
- name: Install dependencies
9098
run: |
91-
echo "deb [arch=amd64 trusted=yes] https://nfd-nightly-apt.ndn.today/ubuntu jammy main" \
99+
echo "deb [arch=amd64 trusted=yes] https://nfd-nightly-apt.ndn.today/ubuntu noble main" \
92100
| sudo tee /etc/apt/sources.list.d/nfd-nightly.list
93101
sudo apt-get update
94-
sudo apt-get install --no-install-recommends clang-format-15 libndn-cxx-dev libpsync-dev nfd
102+
sudo apt-get install --no-install-recommends clang-format-20 libndn-cxx-dev libpsync-dev nfd
95103
sudo cp /etc/ndn/nfd.conf.sample /etc/ndn/nfd.conf
96104
sudo systemctl restart nfd
97-
- run: corepack pnpm install
105+
- run: |
106+
npm install -g corepack
107+
corepack pnpm install
98108
- run: corepack pnpm build
99109
- name: Check dependencies and devDependencies
100110
run: node mk/check-dep.mjs
@@ -111,20 +121,23 @@ jobs:
111121
publish:
112122
needs: [build, unittest, integ]
113123
if: ${{ github.repository == 'yoursunny/NDNts' && github.event_name == 'push' }}
114-
runs-on: ubuntu-22.04
124+
runs-on: ubuntu-24.04
115125
steps:
116126
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
117-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
127+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
118128
with:
119129
path: ~/.local/share/pnpm/store
120130
key: publish-${{ hashFiles('**/package.json') }}
121-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
131+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
122132
with:
123133
node-version: 24
134+
- run: |
135+
npm install -g corepack
136+
corepack pnpm install
124137
- run: corepack pnpm install
125138
env:
126139
PUPPETEER_SKIP_DOWNLOAD: true
127-
- uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
140+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
128141
with:
129142
name: build-lib
130143
path: pkg/

.npmrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
Supported platforms include:
1515

16-
* Node.js: 24.x and 25.x, on Windows and Linux.
16+
* Node.js: 24.x and 26.x, on Windows and Linux.
1717
* Generally, I support latest *Active LTS* and *Current* versions.
1818
* Bundlers: webpack 5.
1919
* Firefox: latest version on Windows and Mac.

integ/browser-tests/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"@types/webpack": "^5.28.5",
2828
"fork-ts-checker-webpack-plugin": "^9.1.0",
2929
"html-webpack-plugin": "^5.6.7",
30-
"puppeteer": "^24.42.0",
30+
"puppeteer": "^25.0.4",
3131
"ts-loader": "^9.5.7",
3232
"tslib": "^2.8.1",
3333
"type-fest": "^5.6.0",
34-
"webpack": "^5.106.2",
34+
"webpack": "^5.107.1",
3535
"webpack-cli": "^7.0.2",
36-
"webpack-dev-server": "^5.2.3"
36+
"webpack-dev-server": "^5.2.4"
3737
}
3838
}

integ/cxx-tests/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ C++ compilation is handled automatically.
88
After upgrading ndn-cxx and related libraries, `make clean` may be necessary.
99

1010
`corepack pnpm clang-format` at the codebase root fixes C++ code style.
11-
This requires `clang-format-15` package.
11+
This requires `clang-format-20` package.
1212

1313
## Run in Docker
1414

@@ -17,7 +17,7 @@ docker build -t localhost/ndnts-cxx - <<EOT
1717
FROM node:22-bookworm
1818
RUN echo "deb [trusted=yes] https://nfd-nightly-apt.ndn.today/debian bookworm main" > /etc/apt/sources.list.d/nfd-nightly.list \
1919
&& apt-get update \
20-
&& apt-get -y -qq install --no-install-recommends clang-format-15 libndn-cxx-dev libpsync-dev ndnsec pkg-config \
20+
&& apt-get -y -qq install --no-install-recommends clang-format-20 libndn-cxx-dev libpsync-dev ndnsec pkg-config \
2121
&& rm -rf /var/lib/apt/lists/*
2222
EOT
2323

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"scripts": {
55
"build": "bash mk/build.sh",
6-
"clang-format": "git ls-files '*.cpp' | xargs -r clang-format-15 -i -style=file",
6+
"clang-format": "git ls-files '*.cpp' | xargs -r clang-format-20 -i -style=file",
77
"cover": "bash mk/build.sh cover",
88
"lint": "bash mk/build.sh lint",
99
"literate": "bash mk/literate.sh",
@@ -13,18 +13,18 @@
1313
"test": "vitest",
1414
"typedoc": "bash mk/typedoc.sh"
1515
},
16-
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8",
16+
"packageManager": "pnpm@10.33.4+sha512.1c67b3b359b2d408119ba1ed289f34b8fc3c6873412bec6fd264fbdc82489e510fcbecb9ce9d22dae7f3b76269d8441046014bdca53b9979cd7a561ad631b800",
1717
"devDependencies": {
18-
"@types/node": "25.3.5",
19-
"@vitest/coverage-v8": "^4.1.5",
18+
"@types/node": "24.12.4",
19+
"@vitest/coverage-v8": "^4.1.7",
2020
"@yoursunny/xo-config": "0.1002.0",
2121
"codedown": "^3.3.0",
2222
"tslib": "^2.8.1",
2323
"typedoc": "0.28.19",
2424
"typescript": "~6.0.3",
25-
"vitest": "^4.1.5"
25+
"vitest": "^4.1.7"
2626
},
2727
"engines": {
28-
"node": "^24.12.0 || ^25.8.0"
28+
"node": "^24.12.0 || ^26.2.0"
2929
}
3030
}

pkg/autoconfig/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"devDependencies": {
3939
"@ndn/util": "workspace:*",
4040
"@types/default-gateway": "^7.2.2",
41-
"@types/koa": "^3.0.2",
42-
"koa": "^3.2.0",
41+
"@types/koa": "^3.0.3",
42+
"koa": "^3.2.1",
4343
"type-fest": "^5.6.0"
4444
}
4545
}

pkg/dpdkmgmt/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@ndn/l3face": "workspace:*",
2929
"@ndn/node-transport": "workspace:*",
3030
"@ndn/packet": "workspace:*",
31-
"graphql": "^16.13.2",
31+
"graphql": "^16.14.0",
3232
"graphql-request": "^7.4.0",
3333
"tslib": "^2.8.1"
3434
},

pkg/keychain/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@ndn/util": "workspace:*",
3333
"@yoursunny/asn1": "0.0.20200718",
3434
"@yoursunny/webcrypto-ed25519": "0.0.20250208",
35-
"idb-keyval": "^6.2.2",
35+
"idb-keyval": "^6.2.4",
3636
"tslib": "^2.8.1",
3737
"type-fest": "^5.6.0",
3838
"wait-your-turn": "^1.0.1"

pkg/util/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"write": "^2.0.0"
4444
},
4545
"engines": {
46-
"node": "^24.12.0 || ^25.8.0"
46+
"node": "^24.12.0 || ^26.2.0"
4747
}
4848
}

0 commit comments

Comments
 (0)