Skip to content

Commit 66f9ef6

Browse files
committed
Replace Intel ICX with FreeBSD build using vmactions/freebsd-vm
1 parent 86818bd commit 66f9ef6

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ jobs:
2222
compiler: clang
2323
cc: clang
2424
cxx: clang++
25-
- os: ubuntu-latest
26-
compiler: intel-icx
27-
cc: icx
28-
cxx: icpx
2925
- os: windows-latest
3026
compiler: msvc
3127
- os: macos-latest
@@ -34,22 +30,7 @@ jobs:
3430
steps:
3531
- uses: actions/checkout@v4
3632

37-
- name: Install Intel oneAPI (Linux)
38-
if: matrix.compiler == 'intel-icx' && runner.os == 'Linux'
39-
run: |
40-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
41-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
42-
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
43-
sudo apt-get update
44-
sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
45-
46-
- name: Setup Intel oneAPI environment
47-
if: matrix.compiler == 'intel-icx' && runner.os == 'Linux'
48-
run: |
49-
source /opt/intel/oneapi/setvars.sh
50-
echo "CC=icx" >> $GITHUB_ENV
51-
echo "CXX=icpx" >> $GITHUB_ENV
52-
echo "/opt/intel/oneapi/compiler/latest/bin" >> $GITHUB_PATH
33+
5334

5435
- name: Configure CMake
5536
run: >
@@ -58,8 +39,8 @@ jobs:
5839
-DPCG_CPP_BUILD_TESTS=ON
5940
-DCMAKE_BUILD_TYPE=Release
6041
env:
61-
CC: ${{ matrix.cc || env.CC }}
62-
CXX: ${{ matrix.cxx || env.CXX }}
42+
CC: ${{ matrix.cc }}
43+
CXX: ${{ matrix.cxx }}
6344

6445
- name: Build
6546
run: cmake --build build --config Release
@@ -82,3 +63,23 @@ jobs:
8263
shell: pwsh
8364
run: |
8465
./test-high/run-tests.ps1
66+
67+
freebsd:
68+
runs-on: ubuntu-latest
69+
name: FreeBSD
70+
steps:
71+
- uses: actions/checkout@v4
72+
73+
- name: Test on FreeBSD
74+
uses: vmactions/freebsd-vm@v1
75+
with:
76+
usesh: true
77+
prepare: pkg install -y cmake
78+
run: |
79+
cmake -B build -DPCG_CPP_BUILD_SAMPLES=ON -DPCG_CPP_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
80+
cmake --build build --config Release
81+
cd build
82+
ctest -C Release --output-on-failure
83+
cd ..
84+
chmod +x ./test-high/run-tests.sh
85+
./test-high/run-tests.sh

0 commit comments

Comments
 (0)