Skip to content

Commit

Permalink
Adding Cmake verification (#363)
Browse files Browse the repository at this point in the history
Also fixing up verification tests to use the provided NunavutConfig.cmake build.
  • Loading branch information
thirtytwobits authored Dec 18, 2024
1 parent 1e843fd commit 295b695
Show file tree
Hide file tree
Showing 25 changed files with 739 additions and 925 deletions.
1 change: 1 addition & 0 deletions .github/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ def _cmake_configure(args: argparse.Namespace, cmake_args: typing.List[str], cma

cmake_configure_args.append(f"--log-level={cmake_logging_level}")
cmake_configure_args.append(f"-DNUNAVUT_VERIFICATION_LANG={args.language}")
cmake_configure_args.append(f"-DCMAKE_PREFIX_PATH=..")

if args.language_standard is not None:
cmake_configure_args.append(f"-DNUNAVUT_VERIFICATION_LANG_STANDARD={args.language_standard}")
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
working-directory: .tox
- name: report-release
if: ${{ github.event_name != 'pull_request' }}
uses: sonarsource/sonarcloud-github-action@master
uses: SonarSource/sonarqube-scan-action@v4.2.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
Expand All @@ -86,7 +86,7 @@ jobs:
-Dsonar.python.xunit.reportPath=.tox/py311-test/tmp/xunit-result.xml
- name: report-pr
if: ${{ github.event_name == 'pull_request' }}
uses: sonarsource/sonarcloud-github-action@master
uses: SonarSource/sonarqube-scan-action@v4.2.1
env:
SONAR_TOKEN: "6526e88c286672a7852fea52056c4b6ea583aaf7"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -102,7 +102,7 @@ jobs:
compat-test-python3-mac:
strategy:
matrix:
python3-version: ['11','12', '13']
python3-version: ['11', '12', '13']
python3-platform: ['macos-latest']
runs-on: ${{ matrix.python3-platform }}
needs: test
Expand Down
3 changes: 0 additions & 3 deletions .vscode/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions .vscode/cmake-kits.json

This file was deleted.

163 changes: 0 additions & 163 deletions .vscode/cmake-variants.json

This file was deleted.

136 changes: 0 additions & 136 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,120 +32,9 @@
"**/.pytest_cache": true,
"**/*.egg-info": true
},
"cmake.configureOnOpen": false,
"cmake.buildDirectory": "${workspaceFolder}/verification/build_vscode/${buildKit}",
"cmake.sourceDirectory": "${workspaceFolder}/verification",
"cmake.buildBeforeRun": true,
"cmake.copyCompileCommands": "${workspaceFolder}/.vscode/compile_commands.json",
"cmake.generator": "Ninja",
"cmake.configureArgs": [
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE"
],
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
"files.associations": {
"*.py.template": "python",
"nunavut_support.j2": "python",
"*.cc": "cpp",
"*.hpp": "cpp",
"__bit_reference": "cpp",
"__config": "cpp",
"__debug": "cpp",
"__errc": "cpp",
"__functional_base": "cpp",
"__hash_table": "cpp",
"__locale": "cpp",
"__mutex_base": "cpp",
"__node_handle": "cpp",
"__nullptr": "cpp",
"__split_buffer": "cpp",
"__string": "cpp",
"__threading_support": "cpp",
"__tree": "cpp",
"__tuple": "cpp",
"algorithm": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"csetjmp": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"scoped_allocator": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"utility": "cpp",
"valarray": "cpp",
"vector": "cpp",
"serialization.h": "c",
"struct__0_1.h": "c",
"memory_resource": "cpp",
"__functional_03": "cpp",
"any": "cpp",
"span": "cpp",
"variant": "cpp",
"__bits": "cpp",
"filesystem": "cpp",
"__memory": "cpp",
"compare": "cpp",
"concepts": "cpp"
},
"editor.wordWrapColumn": 120,
"editor.rulers": [
Expand All @@ -156,31 +45,6 @@
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"reflow.preferredLineLength": 120,
"testMate.cpp.test.advancedExecutables": [
{
"pattern": "verification/build_vscode/**/suite/{test,Test,TEST}_*",
"cwd": "${workspaceFolder}"
}
],
"testMate.cpp.debug.configTemplate": {
"type": "cppdbg",
"linux": {
"MIMode": "gdb"
},
"osx": {
"MIMode": "lldb",
"externalConsole": false
},
"windows": {
"type": "cppvsdbg"
},
"program": "${exec}",
"args": "${argsArray}",
"cwd": "${workspaceFolder}",
"env": "",
"environment": "",
"sourceFileMap": "${sourceFileMapObj}"
},
"cSpell.allowCompoundWords": true,
"cSpell.caseSensitive": false,
"cSpell.customDictionaries": {
Expand Down
Loading

0 comments on commit 295b695

Please sign in to comment.