Skip to content

Commit ca2be6b

Browse files
traversarotraversaro
committed
Get rid of all additional recipes
1 parent eb1cc07 commit ca2be6b

File tree

21 files changed

+303
-1320
lines changed

21 files changed

+303
-1320
lines changed

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
vinca --multiple --platform linux-64
2828
- name: Generate azure pipelines for linux-64
2929
run: |
30-
vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes --additional-recipes
30+
vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes
3131
- name: Commit files for linux-64
3232
run: |
3333
if [[ -f "linux.yml" ]]; then
@@ -52,7 +52,7 @@ jobs:
5252
vinca --multiple --platform osx-64
5353
- name: Generate azure pipelines for osx-64
5454
run: |
55-
vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes --additional-recipes
55+
vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes
5656
- name: Commit files for osx-64
5757
run: |
5858
if [[ -f "osx.yml" ]]; then
@@ -77,7 +77,7 @@ jobs:
7777
vinca --multiple --platform osx-arm64
7878
- name: Generate azure pipelines for osx-arm64
7979
run: |
80-
vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes --additional-recipes
80+
vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes
8181
- name: Commit files for osx-arm64
8282
run: |
8383
if [[ -f "osx_arm64.yml" ]]; then
@@ -102,7 +102,7 @@ jobs:
102102
vinca --multiple --platform win-64
103103
- name: Generate azure pipelines for win-64
104104
run: |
105-
vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes --additional-recipes
105+
vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes
106106
- name: Commit files for win-64
107107
run: |
108108
if [[ -f "win.yml" ]]; then
@@ -127,7 +127,7 @@ jobs:
127127
vinca --multiple --platform linux-aarch64
128128
- name: Generate azure pipelines for linux-aarch64
129129
run: |
130-
vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes --additional-recipes
130+
vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes
131131
- name: Commit files for linux-aarch64
132132
run: |
133133
if [[ -f "linux_aarch64.yml" ]]; then
@@ -150,11 +150,10 @@ jobs:
150150
run: |
151151
git clean -fdx
152152
vinca --multiple --platform emscripten-wasm32
153-
sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \;'
154153
155154
- name: Generate azure pipelines for emscripten-wasm32
156155
run: |
157-
vinca-gha --platform emscripten-wasm32 --trigger-branch buildbranch_emscripten -d ./recipes --additional-recipes --batch_size 1
156+
vinca-gha --platform emscripten-wasm32 --trigger-branch buildbranch_emscripten -d ./recipes --batch_size 1
158157
- name: Commit files for emscripten-wasm32
159158
run: |
160159
if [[ -f "emscripten_wasm32.yml" ]]; then

‎.github/workflows/testpr.yml‎

Lines changed: 21 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
3333
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
3434

35-
- uses: prefix-dev/[email protected].1
35+
- uses: prefix-dev/[email protected].10
3636
with:
3737
environments: beta
3838
frozen: true
@@ -56,113 +56,39 @@ jobs:
5656
rm -rf /c/Strawberry
5757
rm -rf "/c/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/"
5858
59-
- name: Check what files have changed
60-
id: filecheck
59+
# Regression for https://github.com/RoboStack/ros-jazzy/issues/44
60+
- name: Check that anaconda-client command works fine
6161
shell: bash -l {0}
6262
run: |
63-
git fetch origin main
64-
# continue on error
65-
set +e
66-
git diff --exit-code --name-only origin/main -- vinca_linux_64.yaml > /dev/null
67-
echo "::set-output name=LINUX_YAML_CHANGED::${?}"
68-
git diff --exit-code --name-only origin/main -- vinca_emscripten32.yaml > /dev/null
69-
echo "::set-output name=EMSCRIPTEN32_YAML_CHANGED::${?}"
70-
git diff --exit-code --name-only origin/main -- vinca_linux_aarch64.yaml > /dev/null
71-
echo "::set-output name=LINUX_AARCH_YAML_CHANGED::${?}"
72-
git diff --exit-code --name-only origin/main -- vinca_osx.yaml > /dev/null
73-
echo "::set-output name=OSX_YAML_CHANGED::${?}"
74-
git diff --exit-code --name-only origin/main -- vinca_osx_arm64.yaml > /dev/null
75-
echo "::set-output name=OSX_ARM_YAML_CHANGED::${?}"
76-
git diff --exit-code --name-only origin/main -- vinca_win.yaml > /dev/null
77-
echo "::set-output name=WIN_YAML_CHANGED::${?}"
78-
- name: Generate recipes for linux-64
79-
shell: bash -l {0}
80-
if: matrix.platform == 'linux-64'
81-
run: |
82-
mkdir -p recipes
83-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m
84-
ls -la recipes
85-
- name: Generate recipes for emscripten-wasm32
86-
shell: bash -l {0}
87-
if: steps.filecheck.outputs.EMSCRIPTEN32_YAML_CHANGED == 1 && matrix.platform == 'emscripten-wasm32'
88-
run: |
89-
mkdir -p recipes
90-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform emscripten-wasm32 -m -n
91-
ls -la recipes
92-
- name: Generate recipes for linux-aarch64
93-
shell: bash -l {0}
94-
if: matrix.platform == 'linux-aarch64'
95-
run: |
96-
mkdir -p recipes
97-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m
98-
ls -la recipes
99-
- name: Generate recipes for osx-64
100-
shell: bash -l {0}
101-
if: matrix.platform == 'osx-64'
102-
run: |
103-
mkdir -p recipes
104-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m
105-
ls -la recipes
106-
- name: Generate recipes for osx-arm64
107-
shell: bash -l {0}
108-
if: matrix.platform == 'osx-arm64'
109-
run: |
110-
mkdir -p recipes
111-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m
112-
ls -la recipes
113-
- name: Generate recipes for win-64
63+
pixi run anaconda --version
64+
65+
- name: Long paths workarounds for win-64
11466
shell: bash -l {0}
11567
if: matrix.platform == 'win-64'
11668
run: |
11769
# Workaround for problem related to long paths
11870
echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
11971
mkdir /c/bld
120-
mkdir -p recipes
121-
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m
122-
ls -la recipes
123-
- name: Check if there are packages to be built
124-
id: newrecipecheck
125-
shell: bash -l {0}
126-
run: |
127-
set +e
128-
if [ ! -d recipes ] || [ -z "$(ls -A recipes)" ]; then
129-
echo "RECIPE_CREATED=0" >> $GITHUB_OUTPUT
130-
else
131-
echo "RECIPE_CREATED=1" >> $GITHUB_OUTPUT
132-
fi
133-
- name: Build recipes for linux-64
134-
shell: bash -l {0}
135-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-64'
136-
run: |
137-
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-staging -c conda-forge --skip-existing
138-
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-staging -c conda-forge --skip-existing
139-
- name: Build recipes for emscripten-wasm32
140-
shell: bash -l {0}
141-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.EMSCRIPTEN32_YAML_CHANGED == 1 && matrix.platform == 'emscripten-wasm32'
142-
run: |
143-
env -i $HOME/.pixi/bin/pixi run -e beta sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \;'
144-
env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir ./recipes --target-platform emscripten-wasm32 -m ./conda_build_config.yaml -c https://repo.mamba.pm/emscripten-forge/ -c robostack-staging -c conda-forge --skip-existing --test skip
145-
- name: Build recipes for linux-aarch64
72+
73+
- name: Generate recipes
14674
shell: bash -l {0}
147-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-aarch64'
14875
run: |
149-
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-staging -c conda-forge --skip-existing
150-
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-staging -c conda-forge --skip-existing
151-
- name: Build recipes for osx-64
76+
mkdir -p recipes
77+
pixi run -e beta -v vinca --platform ${{ matrix.platform }} -m -n
78+
79+
- name: Check patches
15280
shell: bash -l {0}
153-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-64'
15481
run: |
155-
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-staging -c conda-forge --skip-existing
156-
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-staging -c conda-forge --skip-existing
157-
- name: Build recipes for osx-arm64
82+
pixi run -e beta python check_patches_clean_apply.py
83+
84+
- name: Build recipes [non emscripten]
15885
shell: bash -l {0}
159-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-arm64'
86+
if: matrix.platform != 'emscripten-wasm32'
16087
run: |
161-
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-staging -c conda-forge --skip-existing
162-
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-staging -c conda-forge --skip-existing
163-
- name: Build recipes for win-64
88+
pixi run -e beta rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
89+
90+
- name: Build recipes [emscripten]
16491
shell: bash -l {0}
165-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'win-64'
92+
if: matrix.platform == 'emscripten-wasm32'
16693
run: |
167-
$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-staging -c conda-forge --skip-existing
168-
$HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml --target-platform win-64 -c robostack-staging -c conda-forge --skip-existing
94+
pixi run -e beta rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://repo.mamba.pm/emscripten-forge/ -c robostack-staging -c conda-forge --skip-existing

0 commit comments

Comments
 (0)