Skip to content

Commit 072c438

Browse files
authored
Merge pull request #240 from aminya/dprint [skip ci]
2 parents 5ff0bde + f1bbf95 commit 072c438

File tree

115 files changed

+1898
-1025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+1898
-1025
lines changed

.vscode/settings.json

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"[dockerfile]": {
3+
"editor.defaultFormatter": "dprint.dprint"
4+
},
5+
"[javascript]": {
6+
"editor.defaultFormatter": "dprint.dprint"
7+
},
8+
"[javascriptreact]": {
9+
"editor.defaultFormatter": "dprint.dprint"
10+
},
11+
"[json]": {
12+
"editor.defaultFormatter": "dprint.dprint"
13+
},
14+
"[jsonc]": {
15+
"editor.defaultFormatter": "dprint.dprint"
16+
},
17+
"[markdown]": {
18+
"editor.defaultFormatter": "dprint.dprint"
19+
},
20+
"[typescript]": {
21+
"editor.defaultFormatter": "dprint.dprint"
22+
},
23+
"[typescriptreact]": {
24+
"editor.defaultFormatter": "dprint.dprint"
25+
},
26+
"[yaml]": {
27+
"editor.defaultFormatter": "dprint.dprint"
28+
},
29+
"cSpell.advanced.feature.useReferenceProviderWithRename": true,
30+
"cSpell.checkOnlyEnabledFileTypes": false,
31+
"cSpell.numSuggestions": 3,
32+
"cSpell.showAutocompleteSuggestions": true,
33+
"eslint.enable": true,
34+
"eslint.options": {
35+
"cache": true,
36+
"cacheLocation": "./node_modules/.cache/eslint/",
37+
"errorOnUnmatchedPattern": false,
38+
"extensions": [
39+
"ts",
40+
"tsx",
41+
"js",
42+
"jsx",
43+
"cjs",
44+
"mjs",
45+
"json",
46+
"yaml",
47+
"astro",
48+
"mdx",
49+
"html"
50+
]
51+
},
52+
"eslint.probe": [
53+
"typescript",
54+
"typescriptreact",
55+
"javascript",
56+
"javascriptreact",
57+
"json",
58+
"jsonc",
59+
"yaml",
60+
"markdown",
61+
"html",
62+
"astro"
63+
],
64+
"explorer.copyRelativePathSeparator": "/",
65+
"files.eol": "\n",
66+
"files.insertFinalNewline": true,
67+
"files.trimFinalNewlines": true,
68+
"hadolint.hadolintPath": "./target/bin/hadolint",
69+
// use dprint instead
70+
"prettier.enable": false
71+
}

cspell.config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ignorePaths:
1212
- .vscode/extensions.json
1313
words:
1414
- aarch
15+
- hadolint
1516
- aminya
1617
- applellvm
1718
- bazel
@@ -33,6 +34,7 @@ words:
3334
- dearmor
3435
- deps
3536
- devel
37+
- dprint
3638
- DVCPKG
3739
- dyld
3840
- eabi

dev/docker/ci/arch-llvm.dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
## base image
2-
FROM archlinux:base as setup-cpp-arch
2+
FROM archlinux:base AS setup-cpp-arch
33

44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
RUN pacman -Syuu --noconfirm && \
77
pacman-db-upgrade && \
8-
# install nodejs
8+
# install nodejs
99
pacman -S --noconfirm --needed nodejs npm && \
10-
11-
# install the compiler and tools
10+
# install the compiler and tools
1211
node /usr/lib/setup-cpp/setup-cpp.js \
1312
--compiler llvm \
1413
--cmake true \
@@ -21,7 +20,7 @@ RUN pacman -Syuu --noconfirm && \
2120
--gcovr true \
2221
--doxygen true \
2322
--ccache true && \
24-
# arch cleanup
23+
# arch cleanup
2524
pacman -Scc --noconfirm && \
2625
rm -rf /var/cache/pacman/pkg/* && \
2726
rm -rf /tmp/*

dev/docker/ci/arch-mingw.dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
## base image
2-
FROM archlinux:base as setup-cpp-arch-mingw
2+
FROM archlinux:base AS setup-cpp-arch-mingw
33

44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
RUN pacman -Syuu --noconfirm && \
77
pacman-db-upgrade && \
8-
# install nodejs
8+
# install nodejs
99
pacman -S --noconfirm --needed nodejs npm && \
10-
11-
# install the compiler and tools
10+
# install the compiler and tools
1211
node /usr/lib/setup-cpp/setup-cpp.js \
1312
--compiler mingw \
1413
--cmake true \
@@ -21,7 +20,7 @@ RUN pacman -Syuu --noconfirm && \
2120
--gcovr true \
2221
--doxygen true \
2322
--ccache true && \
24-
# arch cleanup
23+
# arch cleanup
2524
pacman -Scc --noconfirm && \
2625
rm -rf /var/cache/pacman/pkg/* && \
2726
rm -rf /tmp/*

dev/docker/ci/docker-ci.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ async function main() {
1010
.replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/legacy" "/usr/lib/setup-cpp/"`)
1111
.replace("setup-cpp ", "node /usr/lib/setup-cpp/setup-cpp.js ")
1212
// remove the npm install line
13-
.replace(/# install setup-cpp\n\s*npm install -g setup-cpp.*/, "")
13+
.replace(/# install setup-cpp\n\s*npm install -g setup-cpp.*\n/, "")
1414

1515
// write the new file in dev/docker/ci
1616
await writeFile(`./dev/docker/ci/${name}.dockerfile`, modifiedDockerFile)

dev/docker/ci/fedora-llvm.dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
## base image
2-
FROM fedora:40 as setup-cpp-fedora
2+
FROM fedora:40 AS setup-cpp-fedora
33

44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
# install nodejs
77
RUN dnf -y install nodejs npm && \
8-
9-
# install the compiler and tools
8+
# install the compiler and tools
109
node /usr/lib/setup-cpp/setup-cpp.js \
1110
--compiler llvm \
1211
--cmake true \
@@ -19,7 +18,7 @@ RUN dnf -y install nodejs npm && \
1918
--gcovr true \
2019
--doxygen true \
2120
--ccache true && \
22-
# cleanup
21+
# cleanup
2322
dnf clean all && \
2423
rm -rf /tmp/*
2524

dev/docker/ci/fedora-mingw.dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
## base image
2-
FROM fedora:40 as setup-cpp-fedora-mingw
2+
FROM fedora:40 AS setup-cpp-fedora-mingw
33

44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
# install nodejs
77
RUN dnf -y install nodejs npm && \
8-
9-
# install the compiler and tools
8+
# install the compiler and tools
109
node /usr/lib/setup-cpp/setup-cpp.js \
1110
--compiler mingw \
1211
--cmake true \
@@ -20,7 +19,7 @@ RUN dnf -y install nodejs npm && \
2019
--doxygen true \
2120
--ccache true \
2221
--powershell true && \
23-
# cleanup
22+
# cleanup
2423
dnf clean all && \
2524
rm -rf /tmp/*
2625

dev/docker/ci/ubuntu-llvm.dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#### Base Image
2-
FROM ubuntu:22.04 as setup-cpp-ubuntu
2+
FROM ubuntu:22.04 AS setup-cpp-ubuntu
33

44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
RUN apt-get update -qq && \
7-
# install nodejs
7+
# install nodejs
88
apt-get install -y --no-install-recommends nodejs npm && \
9-
10-
# install the compiler and tools
9+
# install the compiler and tools
1110
node /usr/lib/setup-cpp/setup-cpp.js \
1211
--nala true \
1312
--compiler llvm \
@@ -21,7 +20,7 @@ RUN apt-get update -qq && \
2120
--gcovr true \
2221
--doxygen true \
2322
--ccache true && \
24-
# cleanup
23+
# cleanup
2524
nala autoremove -y && \
2625
nala autopurge -y && \
2726
apt-get clean && \

dev/docker/ci/ubuntu-mingw.dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#### Base Image
2-
FROM ubuntu:22.04 as setup-cpp-ubuntu-mingw
2+
FROM ubuntu:22.04 AS setup-cpp-ubuntu-mingw
33

44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
RUN apt-get update -qq && \
7-
# install nodejs
7+
# install nodejs
88
apt-get install -y --no-install-recommends nodejs npm && \
9-
10-
# install the compiler and tools
9+
# install the compiler and tools
1110
node /usr/lib/setup-cpp/setup-cpp.js \
1211
--nala true \
1312
--compiler mingw \
@@ -22,7 +21,7 @@ RUN apt-get update -qq && \
2221
--doxygen true \
2322
--ccache true \
2423
--powershell true && \
25-
# cleanup
24+
# cleanup
2625
nala autoremove -y && \
2726
nala autopurge -y && \
2827
apt-get clean && \

dev/docker/examples/arch-llvm.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN bash -c 'source ~/.cpprc \
88

99
#### Running environment
1010
# use a fresh image as the runner
11-
FROM archlinux:base as runner
11+
FROM archlinux:base AS runner
1212

1313
# copy the built binaries and their runtime dependencies
1414
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/

0 commit comments

Comments
 (0)