Skip to content

Commit 01f7aeb

Browse files
committed
mk: downgrade to clang-format-19
clang-format-19 is available in noble,resolute,trixie. clang-format-20 is unavailable in trixie.
1 parent cd4e5db commit 01f7aeb

25 files changed

Lines changed: 42 additions & 42 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
echo "deb [arch=amd64 trusted=yes] https://nfd-nightly-apt.ndn.today/ubuntu noble main" \
100100
| sudo tee /etc/apt/sources.list.d/nfd-nightly.list
101101
sudo apt-get update
102-
sudo apt-get install --no-install-recommends clang-format-20 libndn-cxx-dev libpsync-dev nfd
102+
sudo apt-get install --no-install-recommends clang-format-19 libndn-cxx-dev libpsync-dev nfd
103103
sudo cp /etc/ndn/nfd.conf.sample /etc/ndn/nfd.conf
104104
sudo systemctl restart nfd
105105
- run: |

integ/browser-tests/package.json

Lines changed: 6 additions & 6 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": "^25.0.4",
31-
"ts-loader": "^9.5.7",
30+
"puppeteer": "^25.2.1",
31+
"ts-loader": "^9.6.2",
3232
"tslib": "^2.8.1",
33-
"type-fest": "^5.6.0",
34-
"webpack": "^5.107.1",
35-
"webpack-cli": "^7.0.2",
36-
"webpack-dev-server": "^5.2.4"
33+
"type-fest": "^5.7.0",
34+
"webpack": "^5.108.3",
35+
"webpack-cli": "^7.1.0",
36+
"webpack-dev-server": "^5.2.5"
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-20` package.
11+
This requires `clang-format-19` 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-20 libndn-cxx-dev libpsync-dev ndnsec pkg-config \
20+
&& apt-get -y -qq install --no-install-recommends clang-format-19 libndn-cxx-dev libpsync-dev ndnsec pkg-config \
2121
&& rm -rf /var/lib/apt/lists/*
2222
EOT
2323

mk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"@nodelib/fs.walk": "^3.0.1",
77
"@pnpm/lockfile-types": "^7.1.3",
88
"compare-versions": "6.1.1",
9-
"js-yaml": "^4.1.1",
9+
"js-yaml": "^5.2.0",
1010
"readlink": "^3.0.0",
1111
"split2": "^4.2.0",
12-
"type-fest": "^5.6.0"
12+
"type-fest": "^5.7.0"
1313
}
1414
}

package.json

Lines changed: 5 additions & 5 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-20 -i -style=file",
6+
"clang-format": "git ls-files '*.cpp' | xargs -r clang-format-19 -i -style=file",
77
"cover": "bash mk/build.sh cover",
88
"lint": "bash mk/build.sh lint",
99
"literate": "bash mk/literate.sh",
@@ -13,16 +13,16 @@
1313
"test": "vitest",
1414
"typedoc": "bash mk/typedoc.sh"
1515
},
16-
"packageManager": "pnpm@11.3.0+sha512.2c403d6594527287672b1f7056343a1f7c3634036a67ffabfcc2b3d7595d843768f8787148d1b57cf7956c90606bbd192857c363af19e96d2d0ec9ec5741d215",
16+
"packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
1717
"devDependencies": {
18-
"@types/node": "24.12.4",
19-
"@vitest/coverage-v8": "^4.1.7",
18+
"@types/node": "24.13.2",
19+
"@vitest/coverage-v8": "^4.1.9",
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.7"
25+
"vitest": "^4.1.9"
2626
},
2727
"engines": {
2828
"node": "^24.12.0 || ^26.2.0"

pkg/autoconfig/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
"@ndn/node-transport": "workspace:*",
3232
"@ndn/packet": "workspace:*",
3333
"@ndn/quic-transport": "workspace:*",
34-
"@ndn/ws-transport": "workspace:*",
3534
"@ndn/util": "workspace:*",
35+
"@ndn/ws-transport": "workspace:*",
3636
"default-gateway": "^7.2.2",
3737
"p-event": "^7.1.0",
3838
"tslib": "^2.8.1",
39-
"type-fest": "^5.6.0"
39+
"type-fest": "^5.7.0"
4040
},
4141
"devDependencies": {
4242
"@types/default-gateway": "^7.2.2",

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.14.0",
31+
"graphql": "^17.0.1",
3232
"graphql-request": "^7.4.0",
3333
"tslib": "^2.8.1"
3434
},

pkg/keychain-cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
"env-var": "^7.5.0",
3636
"fast-chunk-string": "^1.0.1",
3737
"get-stdin": "^10.0.0",
38-
"nodemailer": "^8.0.8",
38+
"nodemailer": "^9.0.1",
3939
"prompts": "^2.4.2",
4040
"stdout-stream": "^2.0.0",
4141
"tslib": "^2.8.1",
4242
"yargs": "^18.0.0"
4343
},
4444
"devDependencies": {
4545
"@types/fast-chunk-string": "^1.0.3",
46-
"@types/nodemailer": "^8.0.0",
46+
"@types/nodemailer": "^8.0.1",
4747
"@types/prompts": "^2.4.9",
4848
"@types/stdout-stream": "^1.4.2",
4949
"@types/yargs": "^17.0.35"

pkg/keychain/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"@ndn/util": "workspace:*",
3333
"@yoursunny/asn1": "0.0.20200718",
3434
"@yoursunny/webcrypto-ed25519": "0.0.20250208",
35-
"idb-keyval": "^6.2.4",
35+
"idb-keyval": "^6.2.6",
3636
"tslib": "^2.8.1",
37-
"type-fest": "^5.6.0",
37+
"type-fest": "^5.7.0",
3838
"wait-your-turn": "^1.0.1"
3939
},
4040
"devDependencies": {

pkg/l3face/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"retry": "^0.13.1",
3737
"streaming-iterables": "^8.0.1",
3838
"tslib": "^2.8.1",
39-
"type-fest": "^5.6.0",
39+
"type-fest": "^5.7.0",
4040
"typescript-event-target": "^1.1.2"
4141
}
4242
}

0 commit comments

Comments
 (0)