Skip to content

Commit 8c84f96

Browse files
committed
Merge branch 'main' into camera-streamer
2 parents 5cbcd9c + ae158b5 commit 8c84f96

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

.github/workflows/custopize.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
tag: ${{ env.RELEASE_TAG }}
2525
image-zip: ${{ env.IMAGE_ZIP }}
2626
image-url: ${{ env.IMAGE_URL }}
27+
e2e-branch: ${{ env.E2E_BRANCH }}
2728
steps:
2829

2930
- name: "⬇ Checkout"
@@ -131,6 +132,17 @@ jobs:
131132
132133
echo "OCTOPRINT_VERSION=$OCTOPRINT_VERSION" >> $GITHUB_ENV
133134
135+
- name: "🔎 Determine e2e branch"
136+
run: |
137+
E2E_BRANCH="master"
138+
if [[ "${{ env.OCTOPRINT_VERSION }}" == *"-rc"* ]]; then
139+
E2E_BRANCH="maintenance"
140+
fi
141+
142+
echo "E2E branch: $E2E_BRANCH"
143+
144+
echo "E2E_BRANCH=$E2E_BRANCH" >> $GITHUB_ENV
145+
134146
- name: "⬇ Download OctoPi"
135147
id: octopi_download
136148
run: |
@@ -248,7 +260,7 @@ jobs:
248260
workflow: Test against testrig
249261
repo: OctoPrint/devtools
250262
ref: main
251-
inputs: '{"image": "${{ needs.build.outputs.image-url }}", "target": "pic"}'
263+
inputs: '{"image": "${{ needs.build.outputs.image-url }}", "target": "pic", "e2e-branch": "${{ needs.build.outputs.e2e-branch }}"}'
252264
repost-logs: false
253265

254266
deploy:

0 commit comments

Comments
 (0)