Skip to content

Commit c6b157b

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
1 parent 0ae07cd commit c6b157b

21 files changed

+162
-803
lines changed

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

+7-2
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,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/c_cpp/toolshed-arm64/devcontainer.json

+32
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,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+
}

‎.github/workflows/release.yml

+1-1
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

+4-4
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:
@@ -201,7 +201,7 @@ jobs:
201201
language-verification-cpp-clang-native-extra:
202202
runs-on: ubuntu-latest
203203
needs: test
204-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
204+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
205205
steps:
206206
- uses: actions/checkout@v4
207207
with:

‎CONTRIBUTING.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ skip the docker invocations and use ``tox run -s``.
8383

8484
To run the language verification build you'll need to use a different docker container::
8585

86-
docker pull ghcr.io/opencyphal/toolshed:ts22.4.10
87-
docker run --rm -it -v $PWD:/workspace ghcr.io/opencyphal/toolshed:ts22.4.10
86+
docker pull ghcr.io/opencyphal/toolshed:ts24.4.3
87+
docker run --rm -it -v $PWD:/workspace ghcr.io/opencyphal/toolshed:ts24.4.3
8888
cd /workspace/verification
8989
cmake --list-presets
9090

@@ -112,7 +112,7 @@ If you get the following error::
112112
...it may mean you are trying to run one of our 32-bit platform tests using an armv8 docker image. For these builds
113113
you might need to override the target platform and pull the x86 version of the container explicitly. For example::
114114

115-
docker run --rm -it --platform linux/amd64 -v $PWD:/workspace ghcr.io/opencyphal/toolshed:ts22.4.10
115+
docker run --rm -it --platform linux/amd64 -v $PWD:/workspace ghcr.io/opencyphal/toolshed:ts24.4.3
116116

117117

118118
Files Generated by the Tests
@@ -263,7 +263,7 @@ to manually build and run individual unit tests as you develop them.
263263
TLDR::
264264

265265
git submodule update --init --recursive
266-
docker run --rm -it -v $PWD:/repo ghcr.io/opencyphal/toolshed:ts22.4.10
266+
docker run --rm -it -v $PWD:/repo ghcr.io/opencyphal/toolshed:ts24.4.3
267267
cd verification
268268
cmake --preset config-clang-native-c-11
269269
cmake --build --preset build-clang-native-c-11-debug

‎NunavutConfig.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ set_and_check(NUNAVUT_SOURCE_DIR "${PACKAGE_PREFIX_DIR}/src")
3737
check_required_components(Nunavut Python3)
3838

3939
execute_process(
40-
COMMAND ${Python3_EXECUTABLE} ${PACKAGE_PREFIX_DIR}/version_check_nunavut.py --major-minor-version-only
40+
COMMAND ${Python3_EXECUTABLE} nunavut/_version.py
4141
OUTPUT_VARIABLE NUNAVUT_VERSION_MAJOR_MINOR
4242
OUTPUT_STRIP_TRAILING_WHITESPACE
43-
WORKING_DIRECTORY "${PACKAGE_PREFIX_DIR}"
43+
WORKING_DIRECTORY "${NUNAVUT_SOURCE_DIR}"
4444
)
4545

4646
execute_process(
47-
COMMAND ${Python3_EXECUTABLE} ${PACKAGE_PREFIX_DIR}/version_check_nunavut.py --version-only
47+
COMMAND ${Python3_EXECUTABLE} nunavut/_version.py
4848
OUTPUT_VARIABLE NUNAVUT_VERSION
4949
OUTPUT_STRIP_TRAILING_WHITESPACE
50-
WORKING_DIRECTORY "${PACKAGE_PREFIX_DIR}"
50+
WORKING_DIRECTORY "${NUNAVUT_SOURCE_DIR}"
5151
)
5252

5353
message(STATUS "Nunavut version: ${NUNAVUT_VERSION}")

0 commit comments

Comments
 (0)