Skip to content

Commit 973bc94

Browse files
committed
Move clang job to ubuntu-based build
1 parent 835aa1d commit 973bc94

2 files changed

Lines changed: 25 additions & 38 deletions

File tree

.github/workflows/alpine-build.yml

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,22 @@ on:
1010

1111
jobs:
1212
alpine-build:
13-
name: Alpine (${{ matrix.compiler }})
1413
runs-on: ubuntu-latest
1514
container: alpine:latest
16-
timeout-minutes: 60
17-
strategy:
18-
matrix:
19-
compiler: [gcc, clang]
20-
include:
21-
- compiler: gcc
22-
cc: gcc
23-
cxx: g++
24-
packages: build-base
25-
ROBOT_MODEL: 'ur5e'
26-
URSIM_VERSION: '5.24.0'
27-
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
28-
- compiler: clang
29-
cc: clang
30-
cxx: clang++
31-
ROBOT_MODEL: 'ur5e'
32-
packages: build-base clang
33-
URSIM_VERSION: '5.24.0'
34-
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
15+
timeout-minutes: 30
3516

3617
steps:
3718
- name: install dependencies
38-
run: apk add --no-cache ${{ matrix.packages }} cmake linux-headers git python3 docker
19+
run: apk add --no-cache build-base cmake linux-headers git
3920
- uses: actions/checkout@v6
40-
- name: start ursim
41-
run: >
42-
/bin/bash
43-
scripts/start_ursim.sh -m $ROBOT_MODEL -v $URSIM_VERSION -p $PROGRAM_FOLDER -d -f DISABLED
44-
env:
45-
DOCKER_RUN_OPTS: --network ursim_net
46-
ROBOT_MODEL: ${{matrix.env.ROBOT_MODEL}}
47-
URSIM_VERSION: ${{matrix.env.URSIM_VERSION}}
48-
PROGRAM_FOLDER: ${{matrix.env.PROGRAM_FOLDER}}
49-
- name: install-pips
50-
run: pip install pandas lxml
5121
- name: configure
5222
run: >
53-
mkdir build && cd build &&
23+
mkdir build &&
24+
cd build &&
5425
cmake ..
5526
-DBUILDING_TESTS=1
56-
-DINTEGRATION_TESTS=1
57-
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
58-
-DCMAKE_C_COMPILER=${{ matrix.cc }}
59-
-DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
27+
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON
6028
- name: build
61-
run: cmake --build build --config Debug -- -j$(nproc)
29+
run: cmake --build build --config Debug
6230
- name: test
6331
run: cd build && ctest --output-on-failure

.github/workflows/ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,38 @@ jobs:
2020
- ROBOT_MODEL: 'ur5'
2121
URSIM_VERSION: '3.14.3'
2222
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/cb3'
23+
cc: gcc
24+
cxx: g++
2325
- ROBOT_MODEL: 'ur5e'
2426
URSIM_VERSION: '5.9.4'
2527
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
28+
cc: gcc
29+
cxx: g++
2630
- ROBOT_MODEL: 'ur20'
2731
URSIM_VERSION: 'latest'
2832
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
33+
cc: gcc
34+
cxx: g++
35+
- ROBOT_MODEL: 'ur16e'
36+
URSIM_VERSION: '5.12.6'
37+
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
38+
cc: clang
39+
cxx: gclang++
2940
- ROBOT_MODEL: 'ur5e'
3041
URSIM_VERSION: '10.7.0'
3142
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
43+
cc: gcc
44+
cxx: g++
3245
- ROBOT_MODEL: 'ur5e'
3346
URSIM_VERSION: '10.11.0'
3447
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
48+
cc: gcc
49+
cxx: g++
3550
- ROBOT_MODEL: 'ur5e'
3651
URSIM_VERSION: '10.12.0'
3752
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
53+
cc: gcc
54+
cxx: g++
3855

3956
steps:
4057
- uses: actions/checkout@v6
@@ -67,6 +84,8 @@ jobs:
6784
-DWITH_ASAN=ON
6885
-DPRIMARY_CLIENT_STRICT_PARSING=ON
6986
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON
87+
-DCMAKE_C_COMPILER=${{ matrix.env.cc }}
88+
-DCMAKE_CXX_COMPILER=${{ matrix.env.cxx }}
7089
env:
7190
CXXFLAGS: -g -O2 -fprofile-arcs -ftest-coverage
7291
CFLAGS: -g -O2 -fprofile-arcs -ftest-coverage

0 commit comments

Comments
 (0)