Skip to content

Commit 40eccf4

Browse files
Merge pull request #40 from traversaro/removechecks
Remove check for .yaml modification before recipe generated in testpr CI job and fix testpr job
2 parents fd6ca4f + 1ffa824 commit 40eccf4

File tree

2 files changed

+15
-29
lines changed

2 files changed

+15
-29
lines changed

.github/workflows/testpr.yml

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
on:
22
pull_request:
3-
paths:
4-
- '*.yaml'
3+
workflow_dispatch:
54

65
env:
76
ROS_VERSION: 2
@@ -56,58 +55,41 @@ jobs:
5655
rm -rf /c/Strawberry
5756
rm -rf "/c/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/"
5857
59-
- name: Check what files have changed
60-
id: filecheck
61-
shell: bash -l {0}
62-
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_linux_aarch64.yaml > /dev/null
69-
echo "::set-output name=LINUX_AARCH_YAML_CHANGED::${?}"
70-
git diff --exit-code --name-only origin/main -- vinca_osx.yaml > /dev/null
71-
echo "::set-output name=OSX_YAML_CHANGED::${?}"
72-
git diff --exit-code --name-only origin/main -- vinca_osx_arm64.yaml > /dev/null
73-
echo "::set-output name=OSX_ARM_YAML_CHANGED::${?}"
74-
git diff --exit-code --name-only origin/main -- vinca_win.yaml > /dev/null
75-
echo "::set-output name=WIN_YAML_CHANGED::${?}"
7658
- name: Generate recipes for linux-64
7759
shell: bash -l {0}
78-
if: steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.platform == 'linux-64'
60+
if: matrix.platform == 'linux-64'
7961
run: |
8062
cp vinca_linux_64.yaml vinca.yaml
8163
mkdir -p recipes
8264
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m -n
8365
ls -la recipes
8466
- name: Generate recipes for linux-aarch64
8567
shell: bash -l {0}
86-
if: steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.platform == 'linux-aarch64'
68+
if: matrix.platform == 'linux-aarch64'
8769
run: |
8870
cp vinca_linux_aarch64.yaml vinca.yaml
8971
mkdir -p recipes
9072
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m -n
9173
ls -la recipes
9274
- name: Generate recipes for osx-64
9375
shell: bash -l {0}
94-
if: steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.platform == 'osx-64'
76+
if: matrix.platform == 'osx-64'
9577
run: |
9678
cp vinca_osx.yaml vinca.yaml
9779
mkdir -p recipes
9880
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m -n
9981
ls -la recipes
10082
- name: Generate recipes for osx-arm64
10183
shell: bash -l {0}
102-
if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.platform == 'osx-arm64'
84+
if: matrix.platform == 'osx-arm64'
10385
run: |
10486
cp vinca_osx_arm64.yaml vinca.yaml
10587
mkdir -p recipes
10688
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m -n
10789
ls -la recipes
10890
- name: Generate recipes for win-64
10991
shell: bash -l {0}
110-
if: steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.platform == 'win-64'
92+
if: matrix.platform == 'win-64'
11193
run: |
11294
# Workaround for problem related to long paths
11395
echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
@@ -126,31 +108,31 @@ jobs:
126108
echo "::set-output name=RECIPE_CREATED::${?}"
127109
- name: Build recipes for linux-64
128110
shell: bash -l {0}
129-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.platform == 'linux-64'
111+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-64'
130112
run: |
131113
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
132114
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
133115
- name: Build recipes for linux-aarch64
134116
shell: bash -l {0}
135-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.platform == 'linux-aarch64'
117+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-aarch64'
136118
run: |
137119
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
138120
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
139121
- name: Build recipes for osx-64
140122
shell: bash -l {0}
141-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.platform == 'osx-64'
123+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-64'
142124
run: |
143125
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
144126
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
145127
- name: Build recipes for osx-arm64
146128
shell: bash -l {0}
147-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.platform == 'osx-arm64'
129+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-arm64'
148130
run: |
149131
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
150132
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
151133
- name: Build recipes for win-64
152134
shell: bash -l {0}
153-
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.platform == 'win-64'
135+
if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'win-64'
154136
run: |
155137
$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
156138
$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

conda_build_config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ pugixml:
1111
libopencv:
1212
- 4.11.0
1313

14+
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
15+
cmake:
16+
- 3.*
17+
1418
cdt_name: # [linux]
1519
- conda # [linux]
1620

0 commit comments

Comments
 (0)