Skip to content

Commit 7524edb

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 85ec054 + c2c4daa commit 7524edb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/build-notebooks-TEMPLATE.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ jobs:
262262
echo "IMAGE_TAG=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
263263
echo "OUTPUT_IMAGE=${{ env.IMAGE_REGISTRY}}:${{ inputs.target }}-${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
264264
265+
echo "SANITIZED_PLATFORM=$(echo "${{ inputs.platform }}" | sed 's/[^a-zA-Z0-9._-]/_/g')" >> "$GITHUB_OUTPUT"
266+
265267
# endregion
266268

267269
# region Image build
@@ -686,7 +688,7 @@ jobs:
686688
- uses: actions/upload-artifact@v4
687689
if: ${{ !cancelled() && fromJson(inputs.github).event_name == 'pull_request' && contains(inputs.target, 'codeserver') }}
688690
with:
689-
name: "${{ inputs.target }}_playwright-report"
691+
name: "${{ inputs.target }}_${{ steps.calculated_vars.outputs.SANITIZED_PLATFORM }}_playwright-report"
690692
path: tests/browser/playwright-report/
691693
retention-days: 30
692694

.github/workflows/insta-merge.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
---
12
name: Insta Merge Konflux PRs
23

3-
on:
4+
on: # yamllint disable-line rule:truthy
45
pull_request:
56
paths:
67
- manifests/base/params-latest.env
@@ -25,4 +26,4 @@ jobs:
2526
env:
2627
GITHUB_TOKEN: ${{ github.token }}
2728
run: |
28-
gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}
29+
gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}

0 commit comments

Comments
 (0)