Skip to content

Commit 7ee32e0

Browse files
authored
chore(ci,hotfix): fixing main pipeline checkout steps and args (#3702)
Signed-off-by: Tibor Dancs <[email protected]>
1 parent 97a0e5e commit 7ee32e0

File tree

1 file changed

+24
-17
lines changed

1 file changed

+24
-17
lines changed

.github/workflows/e2e-main.yaml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,14 @@ on:
2525

2626
workflow_dispatch:
2727
inputs:
28-
organization:
29-
default: 'containers'
30-
description: 'Organization of the Podman Desktop repository'
28+
podman_desktop_repo_args:
29+
default: 'REPO=podman-desktop,FORK=podman-desktop,BRANCH=main'
30+
description: 'Podman Desktop repo fork and branch'
3131
type: string
3232
required: true
33-
repositoryName:
34-
default: 'podman-desktop-extension-ai-lab'
35-
description: 'Podman Desktop Extension AI Lab repository name'
36-
type: string
37-
required: true
38-
branch:
39-
default: 'main'
40-
description: 'Podman Desktop Extension AI Lab repo branch'
33+
ext_repo_options:
34+
default: 'REPO=podman-desktop-extension-ai-lab,FORK=containers,BRANCH=main'
35+
description: 'Podman Desktop Extension repo, fork and branch'
4136
type: string
4237
required: true
4338

@@ -46,23 +41,35 @@ jobs:
4641
name: Run E2E tests ${{ github.event_name == 'schedule' && '[nightly]' || '' }}
4742
runs-on: ubuntu-24.04
4843
steps:
44+
- name: Set default env variables
45+
env:
46+
DEFAULT_PODMAN_DESKTOP_REPO_ARGS: 'REPO=podman-desktop,FORK=podman-desktop,BRANCH=main'
47+
DEFAULT_EXT_REPO_OPTIONS: 'REPO=podman-desktop-extension-ai-lab,FORK=containers,BRANCH=main'
48+
run: |
49+
echo "${{ github.event.inputs.podman_desktop_repo_args || env.DEFAULT_PODMAN_DESKTOP_REPO_ARGS }}" | awk -F ',' \
50+
'{for (i=1; i<=NF; i++) {split($i, kv, "="); print "PD_"kv[1]"="kv[2]}}' >> $GITHUB_ENV
51+
echo "${{ github.event.inputs.ext_repo_options || env.DEFAULT_EXT_REPO_OPTIONS }}" | awk -F ',' \
52+
'{for (i=1; i<=NF; i++) {split($i, kv, "="); print "EXT_"kv[1]"="kv[2]}}' >> $GITHUB_ENV
53+
4954
- uses: actions/checkout@v5
55+
name: Checkout AI Lab - Workflow Dispatch
5056
if: github.event_name == 'workflow_dispatch'
5157
with:
52-
repository: ${{ github.event.inputs.organization }}/${{ github.event.inputs.repositoryName }}
53-
ref: ${{ github.event.inputs.branch }}
54-
path: ${{ github.event.inputs.repositoryName }}
58+
repository: ${{ env.EXT_FORK }}/${{ env.EXT_REPO }}
59+
ref: ${{ env.EXT_BRANCH }}
60+
path: podman-desktop-extension-ai-lab
5561

5662
- uses: actions/checkout@v5
63+
name: Checkout AI Lab - Push or Schedule
5764
if: github.event_name == 'push' || github.event_name == 'schedule'
5865
with:
5966
path: podman-desktop-extension-ai-lab
6067

61-
# Checkout podman desktop
6268
- uses: actions/checkout@v5
69+
name: Checkout Podman Desktop
6370
with:
64-
repository: containers/podman-desktop
65-
ref: main
71+
repository: ${{ env.PD_FORK }}/${{ env.PD_REPO }}
72+
ref: ${{ env.PD_BRANCH }}
6673
path: podman-desktop
6774

6875
- uses: pnpm/action-setup@v4

0 commit comments

Comments
 (0)