Skip to content

Commit 56e5367

Browse files
committed
update workflow conditions, unify builds
1 parent 3125018 commit 56e5367

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

.github/workflows/tests-e2e.yml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
require_approval: true
3030
allow_workflow_dispatch: true
3131

32-
# E2E Docker
3332
build-docker:
3433
needs: approval-dedupe
3534
if: needs.approval-dedupe.outputs.mode == 'run'
@@ -39,46 +38,53 @@ jobs:
3938
debug: ${{ inputs.debug || false }}
4039
for_e2e_tests: true
4140

42-
e2e-docker-tests:
43-
needs: build-docker
44-
uses: ./.github/workflows/tests-e2e-docker.yml
41+
build-appimage:
42+
needs: approval-dedupe
43+
if: needs.approval-dedupe.outputs.mode == 'run'
44+
uses: ./.github/workflows/pipeline-build-linux.yml
4545
secrets: inherit
4646
with:
47+
target: build_linux_appimage_x64
4748
debug: ${{ inputs.debug || false }}
4849

49-
tests-e2e-playwright:
50-
needs: build-docker
51-
uses: ./.github/workflows/tests-e2e-playwright.yml
50+
builds-complete:
51+
needs: [build-docker, build-appimage]
52+
runs-on: ubuntu-latest
53+
steps:
54+
- name: Both builds finished
55+
run: echo "Docker and AppImage builds completed"
56+
57+
e2e-docker-tests:
58+
needs: builds-complete
59+
uses: ./.github/workflows/tests-e2e-docker.yml
5260
secrets: inherit
5361
with:
5462
debug: ${{ inputs.debug || false }}
5563

56-
# E2E AppImage
57-
build-appimage:
58-
needs: approval-dedupe
59-
if: needs.approval-dedupe.outputs.mode == 'run'
60-
uses: ./.github/workflows/pipeline-build-linux.yml
64+
tests-e2e-playwright:
65+
needs: builds-complete
66+
uses: ./.github/workflows/tests-e2e-playwright.yml
6167
secrets: inherit
6268
with:
63-
target: build_linux_appimage_x64
6469
debug: ${{ inputs.debug || false }}
6570

6671
e2e-appimage-tests:
67-
needs: build-appimage
72+
needs: builds-complete
6873
uses: ./.github/workflows/tests-e2e-appimage.yml
6974
secrets: inherit
7075
with:
7176
debug: ${{ inputs.debug || false }}
7277

7378
clean:
7479
uses: ./.github/workflows/clean-deployments.yml
75-
if: always()
76-
needs: [e2e-docker-tests, e2e-appimage-tests, tests-e2e-playwright]
80+
if: always() && needs.approval-dedupe.outputs.mode == 'run'
81+
needs: [approval-dedupe, e2e-docker-tests, e2e-appimage-tests, tests-e2e-playwright]
7782

7883
# Remove artifacts from github actions
7984
remove-artifacts:
8085
name: Remove artifacts
81-
needs: [e2e-docker-tests, e2e-appimage-tests, tests-e2e-playwright]
86+
if: needs.approval-dedupe.outputs.mode == 'run'
87+
needs: [approval-dedupe, e2e-docker-tests, e2e-appimage-tests, tests-e2e-playwright]
8288
runs-on: ubuntu-latest
8389
steps:
8490
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)