Skip to content

Commit 54111e5

Browse files
Tobias-FischerTobias-Fischer
committed
Simplify workflow, run aarch on cirun
1 parent 3ee10cb commit 54111e5

File tree

1 file changed

+26
-47
lines changed

1 file changed

+26
-47
lines changed

‎.github/workflows/testpr.yml

Lines changed: 26 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,23 @@ env:
88

99
jobs:
1010
build:
11-
runs-on: ${{ matrix.os }}
1211
strategy:
1312
fail-fast: false
1413
matrix:
15-
os: [ubuntu-latest, macos-13, macos-14, windows-2019]
16-
platform: [linux-64, linux-aarch64, osx-64, win-64, osx-arm64]
17-
environment: [beta]
18-
exclude:
19-
- os: ubuntu-latest
20-
platform: win-64
21-
- os: ubuntu-latest
22-
platform: osx-64
14+
include:
2315
- os: ubuntu-latest
24-
platform: osx-arm64
25-
- os: macos-14
2616
platform: linux-64
27-
- os: macos-14
17+
- os: cirun-linux-aarch64--${{ github.run_id }}
2818
platform: linux-aarch64
29-
- os: macos-14
19+
- os: macos-13
3020
platform: osx-64
3121
- os: macos-14
32-
platform: win-64
33-
- os: macos-13
34-
platform: linux-64
35-
- os: macos-13
36-
platform: linux-aarch64
37-
- os: macos-13
3822
platform: osx-arm64
39-
- os: macos-13
40-
platform: win-64
41-
- os: windows-2019
42-
platform: linux-64
43-
- os: windows-2019
44-
platform: linux-aarch64
45-
- os: windows-2019
46-
platform: osx-64
4723
- os: windows-2019
48-
platform: osx-arm64
24+
platform: win-64
25+
26+
runs-on: ${{ matrix.os }}
27+
4928
steps:
5029
- uses: actions/checkout@v4
5130
with:
@@ -54,7 +33,7 @@ jobs:
5433

5534
- uses: prefix-dev/[email protected]
5635
with:
57-
environments: ${{ matrix.environment }}
36+
environments: beta
5837
frozen: true
5938

6039
# Workaround for https://github.com/RoboStack/ros-humble/pull/141#issuecomment-1941919816
@@ -66,14 +45,14 @@ jobs:
6645
# git in C:\Program Files\Git\bin is used by pip install git+
6746
dirs: 'C:\Program Files\Git\usr\bin;C:\Program Files\Git\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin'
6847

69-
- shell: bash -l {0}
70-
if: matrix.platform == 'linux-aarch64'
71-
run: |
72-
echo "::group::Configure binfmt_misc"
73-
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
74-
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
75-
export GIT_BRANCH="$(basename $GITHUB_REF)"
76-
echo "::endgroup::"
48+
# - shell: bash -l {0}
49+
# if: matrix.platform == 'linux-aarch64'
50+
# run: |
51+
# echo "::group::Configure binfmt_misc"
52+
# docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
53+
# export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
54+
# export GIT_BRANCH="$(basename $GITHUB_REF)"
55+
# echo "::endgroup::"
7756

7857
- name: Install libgl1-mesa-dev (only for linux-aarch64)
7958
if: matrix.platform == 'linux-aarch64'
@@ -111,39 +90,39 @@ jobs:
11190
echo "::set-output name=WIN_YAML_CHANGED::${?}"
11291
- name: Generate recipes for linux-64
11392
shell: bash -l {0}
114-
if: steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-64'
93+
if: steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.platform == 'linux-64'
11594
run: |
11695
cp vinca_linux_64.yaml vinca.yaml
11796
mkdir -p recipes
11897
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m -n
11998
ls -la recipes
12099
- name: Generate recipes for linux-aarch64
121100
shell: bash -l {0}
122-
if: steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-aarch64'
101+
if: steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.platform == 'linux-aarch64'
123102
run: |
124103
cp vinca_linux_aarch64.yaml vinca.yaml
125104
mkdir -p recipes
126105
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m -n
127106
ls -la recipes
128107
- name: Generate recipes for osx-64
129108
shell: bash -l {0}
130-
if: steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.os == 'macos-13' && matrix.platform == 'osx-64'
109+
if: steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.platform == 'osx-64'
131110
run: |
132111
cp vinca_osx.yaml vinca.yaml
133112
mkdir -p recipes
134113
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m -n
135114
ls -la recipes
136115
- name: Generate recipes for osx-arm64
137116
shell: bash -l {0}
138-
if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-14' && matrix.platform == 'osx-arm64'
117+
if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.platform == 'osx-arm64'
139118
run: |
140119
cp vinca_osx_arm64.yaml vinca.yaml
141120
mkdir -p recipes
142121
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m -n
143122
ls -la recipes
144123
- name: Generate recipes for win-64
145124
shell: bash -l {0}
146-
if: steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.os == 'windows-2019' && matrix.platform == 'win-64'
125+
if: steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.platform == 'win-64'
147126
run: |
148127
# Workaround for problem related to long paths
149128
echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
@@ -162,31 +141,31 @@ jobs:
162141
echo "::set-output name=RECIPE_CREATED::${?}"
163142
- name: Build recipes for linux-64
164143
shell: bash -l {0}
165-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-64'
144+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.platform == 'linux-64'
166145
run: |
167146
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
168147
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
169148
- name: Build recipes for linux-aarch64
170149
shell: bash -l {0}
171-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-aarch64'
150+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.platform == 'linux-aarch64'
172151
run: |
173152
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
174153
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
175154
- name: Build recipes for osx-64
176155
shell: bash -l {0}
177-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.os == 'macos-13' && matrix.platform == 'osx-64'
156+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.platform == 'osx-64'
178157
run: |
179158
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
180159
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
181160
- name: Build recipes for osx-arm64
182161
shell: bash -l {0}
183-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-14' && matrix.platform == 'osx-arm64'
162+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.platform == 'osx-arm64'
184163
run: |
185164
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
186165
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
187166
- name: Build recipes for win-64
188167
shell: bash -l {0}
189-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.os == 'windows-2019' && matrix.platform == 'win-64'
168+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.platform == 'win-64'
190169
run: |
191170
$HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform win64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
192171
$HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform win64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing

0 commit comments

Comments
 (0)