Skip to content

Commit 1b2b018

Browse files
traversarotraversaro
committed
Merge default and beta pixi environments in unified default environment
1 parent cbd6397 commit 1b2b018

File tree

3 files changed

+145
-645
lines changed

3 files changed

+145
-645
lines changed

‎.github/workflows/testpr.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- "ros-jazzy-livox-ros-driver2"
1818
- os: ubuntu-24.04-arm
1919
platform: linux-aarch64
20-
additional_recipes:
20+
additional_recipes:
2121
- "ros-jazzy-livox-ros-driver2"
2222
- os: macos-13
2323
platform: osx-64
@@ -37,10 +37,9 @@ jobs:
3737
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
3838
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
3939

40-
- uses: prefix-dev/setup-pixi@v0.8.8
40+
- uses: prefix-dev/setup-pixi@v0.8.10
4141
with:
4242
pixi-version: v0.44.0
43-
environments: beta
4443
frozen: true
4544

4645
# Workaround for https://github.com/RoboStack/ros-humble/pull/141#issuecomment-1941919816
@@ -75,31 +74,31 @@ jobs:
7574
run: |
7675
cp vinca_linux_64.yaml vinca.yaml
7776
mkdir -p recipes
78-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m -n
77+
$HOME/.pixi/bin/pixi run -v vinca --platform linux-64 -m -n
7978
ls -la recipes
8079
- name: Generate recipes for linux-aarch64
8180
shell: bash -l {0}
8281
if: matrix.platform == 'linux-aarch64'
8382
run: |
8483
cp vinca_linux_aarch64.yaml vinca.yaml
8584
mkdir -p recipes
86-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m -n
85+
$HOME/.pixi/bin/pixi run -v vinca --platform linux-aarch64 -m -n
8786
ls -la recipes
8887
- name: Generate recipes for osx-64
8988
shell: bash -l {0}
9089
if: matrix.platform == 'osx-64'
9190
run: |
9291
cp vinca_osx.yaml vinca.yaml
9392
mkdir -p recipes
94-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m -n
93+
$HOME/.pixi/bin/pixi run -v vinca --platform osx-64 -m -n
9594
ls -la recipes
9695
- name: Generate recipes for osx-arm64
9796
shell: bash -l {0}
9897
if: matrix.platform == 'osx-arm64'
9998
run: |
10099
cp vinca_osx_arm64.yaml vinca.yaml
101100
mkdir -p recipes
102-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m -n
101+
$HOME/.pixi/bin/pixi run -v vinca --platform osx-arm64 -m -n
103102
ls -la recipes
104103
- name: Generate recipes for win-64
105104
shell: bash -l {0}
@@ -110,7 +109,7 @@ jobs:
110109
mkdir /c/bld
111110
cp vinca_win.yaml vinca.yaml
112111
mkdir -p recipes
113-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m -n
112+
$HOME/.pixi/bin/pixi run -v vinca --platform win-64 -m -n
114113
ls -la recipes
115114
- name: Copy additional recipes which have been changed into recipes
116115
shell: bash -l {0}
@@ -131,34 +130,34 @@ jobs:
131130
shell: bash -l {0}
132131
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-64'
133132
run: |
134-
env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
135-
# 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
136-
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
133+
env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
134+
# env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
135+
env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
137136
- name: Build recipes for linux-aarch64
138137
shell: bash -l {0}
139138
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-aarch64'
140139
run: |
141-
env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
142-
# 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
143-
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
140+
env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
141+
# env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
142+
env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
144143
- name: Build recipes for osx-64
145144
shell: bash -l {0}
146145
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-64'
147146
run: |
148-
env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
149-
# 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
150-
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
147+
env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
148+
# env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
149+
env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
151150
- name: Build recipes for osx-arm64
152151
shell: bash -l {0}
153152
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-arm64'
154153
run: |
155-
env -i $HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
156-
# 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
157-
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
154+
env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
155+
# env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
156+
env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
158157
- name: Build recipes for win-64
159158
shell: bash -l {0}
160159
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'win-64'
161160
run: |
162-
$HOME/.pixi/bin/pixi run -e beta python check_patches_clean_apply.py
163-
# $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
164-
$HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
161+
$HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
162+
# $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing
163+
$HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-jazzy -c conda-forge --skip-existing

0 commit comments

Comments
 (0)