Skip to content

Commit 42d328b

Browse files
authored
Merge pull request #387 from jorisv/topic/fix-ci
Fix ubuntu CI
2 parents 71e517c + de47196 commit 42d328b

File tree

5 files changed

+713
-576
lines changed

5 files changed

+713
-576
lines changed

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
submodules: recursive
2323

24-
- uses: prefix-dev/setup-pixi@v0.8.1
24+
- uses: prefix-dev/setup-pixi@v0.9.3
2525
with:
2626
cache: true
2727
environments: all

.github/workflows/macos-linux-pixi.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ jobs:
5353
key: ccache-macos-linux-pixi-${{ matrix.os }}-${{ matrix.build_type }}-${{ github.sha }}
5454
restore-keys: ccache-macos-linux-pixi-${{ matrix.os }}-${{ matrix.build_type }}-
5555

56-
- uses: prefix-dev/setup-pixi@v0.8.1
56+
- uses: prefix-dev/setup-pixi@v0.9.3
5757
with:
58+
pixi-version: v0.63.0
5859
cache: true
5960
environments: ${{ matrix.environment }}
6061

@@ -88,7 +89,7 @@ jobs:
8889
with:
8990
submodules: recursive
9091

91-
- uses: prefix-dev/setup-pixi@v0.9.2
92+
- uses: prefix-dev/setup-pixi@v0.9.3
9293
env:
9394
CMAKE_BUILD_PARALLEL_LEVEL: 2
9495
with:
@@ -104,6 +105,7 @@ jobs:
104105

105106
needs:
106107
- aligator-pixi
108+
- aligator-pixi-build
107109

108110
runs-on: ubuntu-latest
109111

.github/workflows/ubuntu.yml

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
uses: actions/cache@v5
6060
with:
6161
path: .ccache
62-
save-always: true
6362
key: ccache-ubuntu-${{ matrix.container }}-${{ github.sha }}
6463
restore-keys: ccache-ubuntu-${{ matrix.container }}-
6564

@@ -68,7 +67,8 @@ jobs:
6867
sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub $(lsb_release -cs) robotpkg\" >> /etc/apt/sources.list "
6968
apt-key adv --fetch-keys http://robotpkg.openrobots.org/packages/debian/robotpkg.key
7069
71-
- name: Set and install dependencies
70+
- name: Set and install dependencies [Ubuntu 22.04]
71+
if: contains(matrix.container, '22.04')
7272
run: |
7373
export PYTHON3_VERSION=$(python3 -c "import sys; print(str(sys.version_info.major)+str(sys.version_info.minor))")
7474
export APT_DEPENDENCIES="doxygen \
@@ -82,6 +82,33 @@ jobs:
8282
libmimalloc-dev \
8383
python3-numpy \
8484
python3-pytest \
85+
python3-matplotlib \
86+
robotpkg-example-robot-data \
87+
robotpkg-py${PYTHON3_VERSION}-example-robot-data \
88+
robotpkg-py${PYTHON3_VERSION}-eigenpy \
89+
robotpkg-py${PYTHON3_VERSION}-pinocchio"
90+
echo $APT_DEPENDENCIES
91+
92+
apt-get update -qq
93+
DEBIAN_FRONTEND="noninteractive" apt-get install -qq ${APT_DEPENDENCIES}
94+
95+
- name: Set and install dependencies [Ubuntu 24.04]
96+
if: contains(matrix.container, '24.04')
97+
run: |
98+
export PYTHON3_VERSION=$(python3 -c "import sys; print(str(sys.version_info.major)+str(sys.version_info.minor))")
99+
export APT_DEPENDENCIES="doxygen \
100+
ninja-build \
101+
ccache \
102+
libomp-dev \
103+
libomp5 \
104+
libboost-all-dev \
105+
libeigen3-dev \
106+
libfmt-dev \
107+
libmimalloc-dev \
108+
catch2 \
109+
python3-numpy \
110+
python3-pytest \
111+
python3-matplotlib \
85112
robotpkg-example-robot-data \
86113
robotpkg-py${PYTHON3_VERSION}-example-robot-data \
87114
robotpkg-py${PYTHON3_VERSION}-eigenpy \
@@ -116,10 +143,24 @@ jobs:
116143
-DBUILD_EXAMPLES=ON \
117144
-DGENERATE_PYTHON_STUBS=ON \
118145
-DALIGATOR_TRACY_ENABLE=OFF \
119-
-DBUILD_WITH_UBUNTU_22_COMPATIBILITY=${{ ubuntu_22_compatibility }}
146+
-DBUILD_WITH_UBUNTU_22_COMPATIBILITY=${{ matrix.ubuntu_22_compatibility }}
120147
ninja
121-
ctest
148+
ctest --output-on-failure
122149
123150
- name: Display ccache statistics
124151
run: |
125152
ccache -sv
153+
154+
check:
155+
name: check-ubuntu
156+
157+
needs:
158+
- ubuntu
159+
160+
runs-on: ubuntu-latest
161+
162+
steps:
163+
- name: Decide whether the needed jobs succeeded or failed
164+
uses: re-actors/alls-green@release/v1
165+
with:
166+
jobs: ${{ toJSON(needs) }}

.github/workflows/update_pixi_lockfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
persist-credentials: false
2727

2828
- name: Set up pixi
29-
uses: prefix-dev/setup-pixi@v0.8.1
29+
uses: prefix-dev/setup-pixi@v0.9.3
3030
with:
3131
run-install: false
3232

0 commit comments

Comments
 (0)