Skip to content

Commit 032036b

Browse files
thirtytwobitsthirtytwobits
committed
Updating release tagging
Also fixing some other CI errors: 1. Black's opinions seem to have changed recently? 2. Adding arm/amd toolshed devcontainers 3. Removing preset_generator in favor of TCPM 4. Passing NULL into initialization routine to avoid address sanitizer panic.
1 parent 0ae07cd commit 032036b

35 files changed

+274
-989
lines changed

.devcontainer/c_cpp/devcontainer.json renamed to .devcontainer/toolshed-amd64/devcontainer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
2-
"name": "C/C++ verification environment",
3-
"image": "ghcr.io/opencyphal/toolshed:ts22.4.10",
2+
"name": "C/C++ verification environment (amd64)",
3+
"image": "ghcr.io/opencyphal/toolshed:ts24.4.3",
44
"workspaceFolder": "/repo",
55
"workspaceMount": "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=delegated",
6+
"mounts": [
7+
"source=profile-nunavut-c,target=/root,type=volume",
8+
"target=/root/.vscode-server,type=volume"
9+
],
610
"customizations": {
711
"vscode": {
812
"extensions": [
@@ -23,5 +27,6 @@
2327
]
2428
}
2529
},
30+
"runArgs": ["--platform=linux/amd64", "-i"],
2631
"postCreateCommand": "git submodule update --init --recursive"
2732
}

‎.devcontainer/toolshed-arm64/devcontainer.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"name": "C/C++ verification environment (arm64)",
3+
"image": "ghcr.io/opencyphal/toolshed:ts24.4.3",
4+
"workspaceFolder": "/repo",
5+
"workspaceMount": "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=delegated",
6+
"mounts": [
7+
"source=profile-nunavut-c,target=/root,type=volume",
8+
"target=/root/.vscode-server,type=volume"
9+
],
10+
"customizations": {
11+
"vscode": {
12+
"extensions": [
13+
"uavcan.dsdl",
14+
"wholroyd.jinja",
15+
"ms-vscode.cpptools",
16+
"ms-vscode.cpptools-themes",
17+
"ms-vscode.cmake-tools",
18+
"josetr.cmake-language-support-vscode",
19+
"streetsidesoftware.code-spell-checker",
20+
"xaver.clang-format",
21+
"vadimcn.vscode-lldb",
22+
"matepek.vscode-catch2-test-adapter",
23+
"ms-python.python",
24+
"ms-python.mypy-type-checker",
25+
"ms-python.black-formatter",
26+
"ms-python.pylint"
27+
]
28+
}
29+
},
30+
"runArgs": ["--platform=linux/arm64", "-i"],
31+
"postCreateCommand": "git submodule update --init --recursive"
32+
}

.devcontainer/python/devcontainer.json renamed to .devcontainer/toxic/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"workspaceFolder": "/workspace",
55
"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated",
66
"mounts": [
7+
"source=profile-nunavut-python,target=/root,type=volume",
78
"source=root-vscode-server,target=/root/.vscode-server/extensions,type=volume"
89
],
910
"customizations": {

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: version-check
2020
# Fails the release if the release-tag doesn't match the Nunavut version at that tag.
2121
run: |
22-
$(./version_check_nunavut.py -vv --version-check "2.3.4.dev0")
22+
$(python3 ./src/nunavut/_version.py -v --fail-on-mismatch --tag=${{ github.ref }})
2323
- name: lint
2424
run: tox -e lint
2525
- name: test-nnvg

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
language-verification-c:
137137
runs-on: ubuntu-latest
138138
needs: test
139-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
139+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
140140
strategy:
141141
matrix:
142142
architecture: [native32, native]
@@ -159,7 +159,7 @@ jobs:
159159
language-verification-cpp:
160160
runs-on: ubuntu-latest
161161
needs: test
162-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
162+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
163163
strategy:
164164
matrix:
165165
architecture: [native32, native]
@@ -182,7 +182,7 @@ jobs:
182182
language-verification-c-clang-native-extra:
183183
runs-on: ubuntu-latest
184184
needs: test
185-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
185+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
186186
steps:
187187
- uses: actions/checkout@v4
188188
with:

‎.vscode/extensions.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"ms-python.python",
99
"ms-python.mypy-type-checker",
1010
"ms-python.black-formatter",
11-
"ms-python.pylint"
11+
"ms-python.pylint",
12+
"ms-vscode.cpptools-extension-pack",
13+
"streetsidesoftware.code-spell-checker",
14+
"xaver.clang-format",
15+
"vadimcn.vscode-lldb",
16+
"matepek.vscode-catch2-test-adapter"
1217
]
1318
}

‎.vscode/launch.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,22 @@
8989
"module": "pytest",
9090
"cwd": "${workspaceFolder}"
9191
},
92+
{
93+
"type": "cppdbg",
94+
"request": "launch",
95+
"program": "${command:cmake.launchTargetPath}",
96+
"name": "cppdb debug (cmake)",
97+
"args": [],
98+
"cwd": "${workspaceFolder}",
99+
},
92100
{
93101
"type": "lldb",
94102
"request": "launch",
95103
"program": "${command:cmake.launchTargetPath}",
96-
"name": "lldb: cmake.launchTargetPath",
104+
"name": "lldb debug (cmake)",
97105
"args": [],
98106
"cwd": "${workspaceFolder}",
99-
"initCommands": [
100-
"settings set target.process.thread.step-avoid-regexp \"\""
101-
],
107+
"initCommands": ["settings set target.process.thread.step-avoid-regexp \"\""],
102108
"env": {
103109
"PATH": "$PATH:${command:cmake.launchTargetDirectory}",
104110
},

‎.vscode/nunavut-words.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
addoption
22
allclose
3+
asan
34
astype
45
autouse
56
behaviour
@@ -25,6 +26,7 @@ frombuffer
2526
functor
2627
functors
2728
htmlcov
29+
inout
2830
itemsize
2931
lctx
3032
markupsafe

‎.vscode/settings.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,31 @@
4545
"files.trimFinalNewlines": true,
4646
"files.trimTrailingWhitespace": true,
4747
"reflow.preferredLineLength": 120,
48+
"testMate.cpp.test.advancedExecutables": [
49+
{
50+
"pattern": "build/**/suite/{test,Test,TEST}_*",
51+
"cwd": "${workspaceFolder}"
52+
}
53+
],
54+
"testMate.cpp.debug.configTemplate": {
55+
"type": "cppdbg",
56+
"linux": {
57+
"MIMode": "gdb"
58+
},
59+
"osx": {
60+
"MIMode": "lldb",
61+
"externalConsole": false
62+
},
63+
"windows": {
64+
"type": "cppvsdbg"
65+
},
66+
"program": "${exec}",
67+
"args": "${argsArray}",
68+
"cwd": "${workspaceFolder}",
69+
"env": "",
70+
"environment": "",
71+
"sourceFileMap": "${sourceFileMapObj}"
72+
},
4873
"cSpell.allowCompoundWords": true,
4974
"cSpell.caseSensitive": false,
5075
"cSpell.customDictionaries": {

‎.vscode/tasks.json‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
11
{
2-
// See https://go.microsoft.com/fwlink/?LinkId=733558
3-
// for the documentation about the tasks.json format
42
"version": "2.0.0",
53
"tasks": [
64
{
7-
"label": "nunavut-pytest",
8-
"type": "shell",
5+
"type": "cppbuild",
6+
"label": "C/C++: gcc build active file",
7+
"command": "/usr/bin/gcc",
8+
"args": [
9+
"-fdiagnostics-color=always",
10+
"-g",
11+
"${file}",
12+
"-o",
13+
"${fileDirname}/${fileBasenameNoExtension}"
14+
],
915
"options": {
10-
"cwd": "${workspaceFolder}/test"
16+
"cwd": "${fileDirname}"
1117
},
12-
"command": "python -m pytest -s",
13-
"group": {
14-
"kind": "test",
15-
"isDefault": true
16-
}
17-
},
18-
{
19-
"label": "tox build",
20-
"type": "shell",
21-
"command": "tox",
22-
"group": {
23-
"kind": "build",
24-
"isDefault": true
25-
}
26-
},
27-
{
28-
"label": "doc build (tox)",
29-
"type": "shell",
30-
"command": "tox",
31-
"args": [
32-
"-e",
33-
"docs"
18+
"problemMatcher": [
19+
"$gcc"
3420
],
3521
"group": {
3622
"kind": "build",
23+
"isDefault": true
3724
},
38-
"problemMatcher": []
25+
"detail": "Task generated by Debugger."
3926
}
4027
]
41-
}
28+
}

0 commit comments

Comments
 (0)