Skip to content

Commit 895aaca

Browse files
committed
chore: fix the formatting and spelling tests
1 parent aecb4b3 commit 895aaca

File tree

6 files changed

+90
-99
lines changed

6 files changed

+90
-99
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ Before running the tests locally, backup your environment variables because faul
1010

1111
<https://stackoverflow.com/a/5147185/7910299>
1212

13-
1413
Install [container-structure-test](https://github.com/GoogleContainerTools/container-structure-test) for docker testing.
15-

cspell.config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ words:
4545
- msys
4646
- multilib
4747
- mxschmitt
48+
- noconfirm
49+
- noprogressbar
4850
- nothrow
4951
- npmrc
5052
- Opencppcoverage
@@ -54,6 +56,7 @@ words:
5456
- pypy
5557
- setupcpp
5658
- setx
59+
- Syuu
5760
- terserrc
5861
- tsbuildinfo
5962
- ucrt

dev/container-tests/arch.yml

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
schemaVersion: 2.0.0
22

33
commandTests:
4-
- name: gcc compiler
5-
command: gcc
6-
args: ["--version"]
7-
expectedOutput: [".*gcc.*GCC.*"]
8-
- name: g++ compiler
9-
command: g++
10-
args: ["--version"]
11-
expectedOutput: [".*g\\+\\+.*GCC.*"]
12-
- name: cmake
13-
command: cmake
14-
args: ["--version"]
15-
expectedOutput: [".*cmake version.*"]
16-
- name: make
17-
command: make
18-
args: ["--version"]
19-
expectedOutput: [".*GNU Make.*"]
20-
- name: ninja
21-
command: ninja
22-
args: ["--version"]
23-
expectedOutput: [".*1.*"]
24-
- name: gcovr
25-
command: gcovr
26-
args: ["--version"]
27-
expectedOutput: [".*gcovr.*"]
28-
- name: ccache
29-
command: ccache
30-
args: ["--version"]
31-
expectedOutput: [".*ccache.*"]
32-
- name: doxygen
33-
command: doxygen
34-
args: ["--version"]
35-
expectedOutput: [".*1.*"]
36-
- name: cppcheck
37-
command: cppcheck
38-
args: ["--version"]
39-
expectedOutput: [".*Cppcheck.*"]
40-
4+
- name: gcc compiler
5+
command: gcc
6+
args: ["--version"]
7+
expectedOutput: [".*gcc.*GCC.*"]
8+
- name: g++ compiler
9+
command: g++
10+
args: ["--version"]
11+
expectedOutput: [".*g\\+\\+.*GCC.*"]
12+
- name: cmake
13+
command: cmake
14+
args: ["--version"]
15+
expectedOutput: [".*cmake version.*"]
16+
- name: make
17+
command: make
18+
args: ["--version"]
19+
expectedOutput: [".*GNU Make.*"]
20+
- name: ninja
21+
command: ninja
22+
args: ["--version"]
23+
expectedOutput: [".*1.*"]
24+
- name: gcovr
25+
command: gcovr
26+
args: ["--version"]
27+
expectedOutput: [".*gcovr.*"]
28+
- name: ccache
29+
command: ccache
30+
args: ["--version"]
31+
expectedOutput: [".*ccache.*"]
32+
- name: doxygen
33+
command: doxygen
34+
args: ["--version"]
35+
expectedOutput: [".*1.*"]
36+
- name: cppcheck
37+
command: cppcheck
38+
args: ["--version"]
39+
expectedOutput: [".*Cppcheck.*"]
4140

4241
fileExistenceTests:
43-
- name: 'vcpkg'
44-
path: '/root/vcpkg'
45-
shouldExist: true
42+
- name: "vcpkg"
43+
path: "/root/vcpkg"
44+
shouldExist: true

dev/container-tests/ubuntu.yml

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,47 @@
11
schemaVersion: 2.0.0
22

33
commandTests:
4-
- name: gcc compiler
5-
command: gcc
6-
args: ["--version"]
7-
expectedOutput: [".*gcc.*"]
8-
- name: g++ compiler
9-
command: g++
10-
args: ["--version"]
11-
expectedOutput: [".*g\\+\\+.*"]
12-
- name: make
13-
command: make
14-
args: ["--version"]
15-
expectedOutput: [".*GNU Make.*"]
16-
- name: ninja
17-
command: /root/ninja/ninja
18-
args: ["--version"]
19-
expectedOutput: [".*1.*"]
20-
- name: gcovr
21-
command: gcovr
22-
args: ["--version"]
23-
expectedOutput: [".*gcovr.*"]
24-
- name: ccache
25-
command: ccache
26-
args: ["--version"]
27-
expectedOutput: [".*ccache.*"]
28-
- name: doxygen
29-
command: doxygen
30-
args: ["--version"]
31-
expectedOutput: [".*1.*"]
32-
- name: cppcheck
33-
command: cppcheck
34-
args: ["--version"]
35-
expectedOutput: [".*Cppcheck.*"]
36-
- name: clang
37-
command: /root/llvm/bin/clang
38-
args: ["--version"]
39-
expectedOutput: [".*clang.*"]
40-
4+
- name: gcc compiler
5+
command: gcc
6+
args: ["--version"]
7+
expectedOutput: [".*gcc.*"]
8+
- name: g++ compiler
9+
command: g++
10+
args: ["--version"]
11+
expectedOutput: [".*g\\+\\+.*"]
12+
- name: make
13+
command: make
14+
args: ["--version"]
15+
expectedOutput: [".*GNU Make.*"]
16+
- name: ninja
17+
command: /root/ninja/ninja
18+
args: ["--version"]
19+
expectedOutput: [".*1.*"]
20+
- name: gcovr
21+
command: gcovr
22+
args: ["--version"]
23+
expectedOutput: [".*gcovr.*"]
24+
- name: ccache
25+
command: ccache
26+
args: ["--version"]
27+
expectedOutput: [".*ccache.*"]
28+
- name: doxygen
29+
command: doxygen
30+
args: ["--version"]
31+
expectedOutput: [".*1.*"]
32+
- name: cppcheck
33+
command: cppcheck
34+
args: ["--version"]
35+
expectedOutput: [".*Cppcheck.*"]
36+
- name: clang
37+
command: /root/llvm/bin/clang
38+
args: ["--version"]
39+
expectedOutput: [".*clang.*"]
4140

4241
fileExistenceTests:
43-
- name: 'vcpkg'
44-
path: '/root/vcpkg'
45-
shouldExist: true
46-
- name: 'llvm'
47-
path: '/root/llvm'
48-
shouldExist: true
42+
- name: "vcpkg"
43+
path: "/root/vcpkg"
44+
shouldExist: true
45+
- name: "llvm"
46+
path: "/root/llvm"
47+
shouldExist: true

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"scripts": {
1515
"build": "shx rm -rf dist/ && shx mkdir ./dist && run-p test.tsc build.parcel copy.matchers",
1616
"build.docker": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup_cpp .",
17-
"build.docker.ubuntu": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup_cpp:ubuntu .",
1817
"build.docker.arch": "pnpm build && docker build -f ./dev/docker/arch_node.dockerfile -t setup_cpp:arch .",
18+
"build.docker.ubuntu": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup_cpp:ubuntu .",
1919
"build.parcel": "cross-env NODE_ENV=production parcel build --detailed-report",
2020
"bump": "ncu -u -x execa,numerous && pnpm update",
2121
"clean": "shx rm -rf .parcel-cache dist exe",
@@ -26,12 +26,12 @@
2626
"pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./dev/scripts/pack-exe.js",
2727
"prepare": "npm run build",
2828
"start.docker": "docker run -t setup_cpp .",
29-
"start.docker.ubuntu": "docker run -t setup_cpp:ubuntu .",
3029
"start.docker.arch": "docker run -t setup_cpp:arch .",
31-
"test.docker.ubuntu": "docker build -f ./dev/docker/ubuntu_node.dockerfile --target base -t setup_cpp:ubuntu-base . && container-structure-test test --image setup_cpp:ubuntu-base --config ./dev/container-tests/ubuntu.yml",
32-
"test.docker.arch": "docker build -f ./dev/docker/arch_node.dockerfile --target base -t setup_cpp:arch-base . && container-structure-test test --image setup_cpp:arch-base --config ./dev/container-tests/arch.yml",
30+
"start.docker.ubuntu": "docker run -t setup_cpp:ubuntu .",
3331
"test": "run-p test.format test.lint test.cspell test.tsc test.unit",
3432
"test.cspell": "cspell lint --no-progress --show-suggestions",
33+
"test.docker.arch": "docker build -f ./dev/docker/arch_node.dockerfile --target base -t setup_cpp:arch-base . && container-structure-test test --image setup_cpp:arch-base --config ./dev/container-tests/arch.yml",
34+
"test.docker.ubuntu": "docker build -f ./dev/docker/ubuntu_node.dockerfile --target base -t setup_cpp:ubuntu-base . && container-structure-test test --image setup_cpp:ubuntu-base --config ./dev/container-tests/ubuntu.yml",
3535
"test.format": "prettier . --check",
3636
"test.lint": "eslint .",
3737
"test.tsc": "tsc --noEmit | loose-ts-check",

src/utils/setup/setupPacmanPack.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ let didUpdate: boolean = false
1010
let didInit: boolean = false
1111

1212
/** A function that installs a package using pacman */
13-
export function setupPacmanPack(
14-
name: string,
15-
version?: string,
16-
aur?: string,
17-
): InstallationInfo {
13+
export function setupPacmanPack(name: string, version?: string, aur?: string): InstallationInfo {
1814
info(`Installing ${name} ${version ?? ""} via pacman`)
1915

2016
const pacman = "pacman"
@@ -29,11 +25,7 @@ export function setupPacmanPack(
2925
// set time - zone
3026
// TZ = Canada / Pacific
3127
// ln - snf / usr / share / zoneinfo / $TZ / etc / localtime && echo $TZ > /etc/timezone
32-
execSudo(pacman, [
33-
"-Sy",
34-
"--noconfirm",
35-
"base-devel",
36-
])
28+
execSudo(pacman, ["-Sy", "--noconfirm", "base-devel"])
3729
didInit = true
3830
}
3931

0 commit comments

Comments
 (0)