Merge branch 'main' into feature/add-bootstrap-container

Author: rjaegers

.devcontainer/rust/devcontainer-metadata-vscode.json

@@ -7,7 +7,7 @@
       "extensions": [
         "[email protected]",
         "[email protected]",
-        "[email protected].2466",
+        "[email protected].2474",
         "[email protected]",
         "[email protected]"
       ]

.github/workflows/ci.yml

@@ -15,10 +15,11 @@ permissions:
 
 jobs:
   build-test:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         flavor: ["cpp", "rust"]
+        runner: ["ubuntu-latest", "ubuntu-24.04-arm"]
+    runs-on: ${{ matrix.runner }}
     steps:
       # While the docker/build-push-action works from the Git context, we still need
       # the checkout step for running our tests.
@@ -31,7 +32,7 @@ jobs:
           file: .devcontainer/${{ matrix.flavor }}/Dockerfile
           load: true
           tags: ${{ github.repository }}-${{ matrix.flavor }}:test
-          cache-from: type=gha,scope=${{ github.repository }}-${{ matrix.flavor }}
+          cache-from: type=gha,scope=${{ github.repository }}-${{ matrix.flavor }}-${{ matrix.runner }}
       - uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         if: matrix.flavor == 'cpp'
         with:
@@ -42,11 +43,11 @@ jobs:
       - name: Run Tests
         run: |
           set -Eeuo pipefail
-          docker run --rm --mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src="${{ github.workspace }}/test/${{ matrix.flavor }}",dst=/ws -w /ws ${{ github.repository }}-${{ matrix.flavor }}:test bats --formatter junit integration-tests.bats | tee test-report-${{ matrix.flavor }}.xml
+          docker run --rm --mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src="${{ github.workspace }}/test/${{ matrix.flavor }}",dst=/ws -w /ws ${{ github.repository }}-${{ matrix.flavor }}:test bats --formatter junit integration-tests.bats | tee test-report-${{ matrix.flavor }}-${{ matrix.runner }}.xml
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()
         with:
-          name: test-results-${{ matrix.flavor }}
+          name: test-results-${{ matrix.flavor }}-${{ matrix.runner }}
           path: test-report-*.xml
   publish-test:
     runs-on: ubuntu-latest

test/cpp/workspace/clang-cl/toolchain.cmake

@@ -19,4 +19,4 @@ find_program(CMAKE_CXX_COMPILER NAMES clang-cl REQUIRED)
 find_program(CMAKE_AR NAMES llvm-lib REQUIRED)
 
 add_compile_options(--target=x86_64-pc-windows-msvc -fuse-ld=lld /winsdkdir ${WINDOWS_SDK_ROOT}/sdk /vctoolsdir ${WINDOWS_SDK_ROOT}/crt)
-add_link_options(/manifest:no -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/um/x64 -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/ucrt/x64 -libpath:${WINDOWS_SDK_ROOT}/crt/lib/x64)
+add_link_options(/machine:x64 /manifest:no -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/um/x64 -libpath:${WINDOWS_SDK_ROOT}/sdk/lib/ucrt/x64 -libpath:${WINDOWS_SDK_ROOT}/crt/lib/x64)

test/cpp/workspace/fuzzing/main.cpp

@@ -1,10 +1,11 @@
 #include <cstdint>
+#include <cstdlib>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, std::size_t size)
 {
     if (size > 0 && data[0] == 'H')
         if (size > 1 && data[1] == 'I')
-            __builtin_trap();
+            abort();
 
     return 0;
 }