Skip to content

Commit 62bd5ec

Browse files
committed
Clean up CI with Pixi
1 parent a23190f commit 62bd5ec

File tree

6 files changed

+523
-388
lines changed

6 files changed

+523
-388
lines changed

.github/workflows/ci_macos.yml

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,13 @@ on:
2222

2323
jobs:
2424
build:
25-
name: ${{ matrix.os }}-${{ matrix.build_type }}
26-
runs-on: ${{ matrix.os }}
27-
strategy:
28-
fail-fast: false
29-
matrix:
30-
os: [macos-latest]
31-
build_type: [Release]
32-
enable_simd: [ON]
33-
env:
34-
COMPILER: clang
35-
BUILD_TYPE: ${{ matrix.build_type }}
36-
BUILD_DARTPY: OFF
37-
DART_USE_SYSTEM_IMGUI: OFF
38-
IN_CI: ON
39-
ENABLE_SIMD: ${{ matrix.enable_simd }}
40-
steps:
41-
- name: Checkout
42-
uses: actions/checkout@v4
43-
- name: Install Dependencies
44-
env:
45-
INSTALL_OSG_HEAD: OFF # To avoid building OSG, until 3.7 is released.
46-
run: scripts/install_osx.sh
47-
- name: Build
48-
run: sudo -E scripts/build.sh
49-
50-
build_on_pixi:
51-
name: ${{ matrix.os }}-pixi
25+
name: ${{ matrix.os == 'macos-latest-large' && 'x86_64' || 'arm64' }}-${{ matrix.build_type }}
5226
runs-on: ${{ matrix.os }}
5327
strategy:
5428
fail-fast: false
5529
matrix:
5630
os: [macos-latest]
31+
build_type: ["Release", "Debug"]
5732
steps:
5833
- name: Checkout
5934
uses: actions/checkout@v4
@@ -64,12 +39,19 @@ jobs:
6439
cache: true
6540

6641
- name: Check Lint
67-
run: pixi run check-lint
42+
run: |
43+
DART_VERBOSE=ON \
44+
BUILD_TYPE=${{ matrix.build_type }} \
45+
pixi run check-lint
6846
6947
- name: Test DART and dartpy
7048
run: |
49+
DART_VERBOSE=ON \
50+
BUILD_TYPE=${{ matrix.build_type }} \
7151
pixi run test-all
7252
7353
- name: Install
7454
run: |
55+
DART_VERBOSE=ON \
56+
BUILD_TYPE=${{ matrix.build_type }} \
7557
pixi run install

.github/workflows/ci_ubuntu.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,13 @@ on:
2121
workflow_dispatch:
2222

2323
jobs:
24-
build_on_docker:
24+
coverage:
2525
if: github.event_name != 'workflow_dispatch'
26-
name: linux-docker-${{ matrix.os }}-${{ matrix.build_type }}
26+
name: coverage-${{ matrix.os }}-${{ matrix.build_type }}
2727
runs-on: ubuntu-latest
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
# Supported LTS versions
32-
os: [ubuntu-jammy, ubuntu-noble, ubuntu-oracular]
33-
build_type: [Release]
34-
codecov: [OFF]
35-
check_format: [OFF]
36-
build_dartpy: [ON]
37-
enable_simd: [ON]
3831
include:
3932
# For code coverage report to Codecov
4033
- os: ubuntu-jammy
@@ -79,9 +72,13 @@ jobs:
7972
$DART_DEV_IMAGE:$DOCKER_TAG \
8073
/bin/sh -c "cd $GITHUB_WORKSPACE && ./scripts/build.sh"
8174
82-
build_on_pixi:
83-
name: ubuntu-pixi
75+
build:
76+
name: ${{ matrix.build_type }}
8477
runs-on: ubuntu-latest
78+
strategy:
79+
fail-fast: false
80+
matrix:
81+
build_type: ["Release", "Debug"]
8582
steps:
8683
- name: Checkout
8784
uses: actions/checkout@v4
@@ -97,12 +94,19 @@ jobs:
9794
version: 1.0
9895

9996
- name: Check Lint
100-
run: pixi run check-lint
97+
run: |
98+
DART_VERBOSE=ON \
99+
BUILD_TYPE=${{ matrix.build_type }} \
100+
pixi run check-lint
101101
102102
- name: Test DART and dartpy
103103
run: |
104+
DART_VERBOSE=ON \
105+
BUILD_TYPE=${{ matrix.build_type }} \
104106
pixi run test-all
105-
107+
106108
- name: Install
107109
run: |
110+
DART_VERBOSE=ON \
111+
BUILD_TYPE=${{ matrix.build_type }} \
108112
pixi run install

.github/workflows/ci_windows.yml

Lines changed: 10 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -22,80 +22,12 @@ on:
2222

2323
jobs:
2424
build:
25-
name: win-${{ matrix.build_type }}
25+
name: ${{ matrix.build_type }}
2626
runs-on: windows-latest
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
toolset: [""]
31-
build_type: [Release]
32-
build_shared_libs: [OFF] # TODO(JS): Add ON once shared lib build is resolved
33-
34-
steps:
35-
- name: Checkout
36-
uses: actions/checkout@v4
37-
38-
- uses: johnwason/vcpkg-action@v6
39-
with:
40-
# TODO: Add ode and coin-or-ipopt
41-
pkgs: >
42-
assimp
43-
eigen3
44-
fcl
45-
fmt
46-
spdlog
47-
bullet3
48-
freeglut
49-
glfw3
50-
imgui[opengl2-binding]
51-
nlopt
52-
opengl
53-
osg
54-
pagmo2
55-
tinyxml2
56-
tracy
57-
urdfdom
58-
triplet: x64-windows
59-
revision: "2024.06.15"
60-
github-binarycache: true
61-
token: ${{ github.token }}
62-
63-
- name: Install Python dependencies
64-
run: |
65-
python -m pip install --upgrade pip
66-
pip install -U pytest
67-
68-
- name: Build
69-
shell: cmd
70-
run: |
71-
cmake ^
72-
-S . ^
73-
-B build ^
74-
-G "Visual Studio 17 2022" ^
75-
-A x64 ^
76-
-Wno-dev ${{ matrix.toolset }} ^
77-
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^
78-
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" ^
79-
-DDART_MSVC_DEFAULT_OPTIONS=ON ^
80-
-DDART_VERBOSE=ON ^
81-
-DBUILD_SHARED_LIBS=${{ matrix.build_shared_libs }} ^
82-
-DDART_USE_SYSTEM_IMGUI=ON ^
83-
|| exit /b
84-
cmake ^
85-
--build build ^
86-
--config ${{ matrix.build_type }} ^
87-
--target ALL_BUILD ^
88-
--parallel ^
89-
|| exit /b
90-
ctest ^
91-
--test-dir build ^
92-
--output-on-failure ^
93-
--build-config ${{ matrix.build_type }} ^
94-
|| exit /b
95-
96-
build_on_pixi:
97-
name: win-pixi
98-
runs-on: windows-latest
30+
build_type: ["Release", "Debug"]
9931
steps:
10032
- name: Checkout
10133
uses: actions/checkout@v4
@@ -106,12 +38,17 @@ jobs:
10638
cache: true
10739

10840
- name: Check Lint
109-
run: pixi run check-lint
41+
run: |
42+
pixi run check-lint
11043
11144
- name: Test DART and dartpy
11245
run: |
113-
pixi run test # TODO: Change to test-all
114-
46+
$env:DART_VERBOSE = "ON"; `
47+
$env:BUILD_TYPE = "${{ matrix.build_type }}"; `
48+
pixi run test-all
49+
11550
- name: Install
11651
run: |
52+
$env:DART_VERBOSE = "ON"; `
53+
$env:BUILD_TYPE = "${{ matrix.build_type }}"; `
11754
pixi run install

0 commit comments

Comments
 (0)