[eclipse-iceoryx#264] Fix FreeBSD CI

elBoberido · Jul 4, 2024 · fb3a3ec · fb3a3ec
1 parent 90bb6b2
commit fb3a3ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -368,7 +368,9 @@ jobs:
  release: ${{ matrix.freebsd_version }}
  mem: 8192
  copyback: false
+ prepare: pkg install -y cmake curl gcc git llvm
  run: |
+ git config --global --add safe.directory /home/runner/work/iceoryx2/iceoryx2
  ./internal/scripts/ci_prepare_freebsd.sh
  ./internal/scripts/ci_build_and_test_freebsd.sh --toolchain ${{ matrix.toolchain }} --mode ${{ matrix.mode }}
 

diff --git a/internal/scripts/ci_build_and_test_freebsd.sh b/internal/scripts/ci_build_and_test_freebsd.sh
@@ -80,11 +80,12 @@ cmake -S . -B target/ffi/build $CMAKE_BUILD_TYPE_FLAG -DBUILD_EXAMPLES=ON -DBUIL
 cmake --build target/ffi/build
 cmake --install target/ffi/build
 
-echo "#############################"
+echo "##############################"
 echo "# Run language binding tests #"
-echo "#############################"
+echo "##############################"
 
 target/ffi/build/tests/iceoryx2-c-tests
+target/ffi/build/tests/iceoryx2-cxx-tests
 
 echo "################################################################"
 echo "# Build language binding examples in out-of-tree configuration #"

diff --git a/internal/scripts/ci_prepare_freebsd.sh b/internal/scripts/ci_prepare_freebsd.sh
@@ -16,8 +16,6 @@ set -e
 
 export ASSUME_ALWAYS_YES=yes
 
-pkg update
-pkg install -y cmake curl gcc git llvm
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --no-modify-path
 export PATH=$PATH:$HOME/.cargo/bin
 rustup toolchain add beta nightly 1.75.0 stable