Skip to content

Commit bcf8952

Browse files
rjaegersCopilot
andauthored
ci: improvements to speed and robustness (#954)
* ci: remove duplicate image build on main * ci: update node to latest lts version * ci: publish acceptance test results * test: fix path of junit xml * Update test/cpp/features/playwright.config.ts Co-authored-by: Copilot <[email protected]> Signed-off-by: Ron <[email protected]> --------- Signed-off-by: Ron <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent bc0c146 commit bcf8952

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ name: Continuous Integration
44
on:
55
merge_group:
66
pull_request:
7-
push:
8-
branches: [main]
97
workflow_dispatch:
108

119
concurrency:

.github/workflows/wc-acceptance-test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
HEAD_REF: ${{ github.head_ref }}
5757
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
5858
with:
59-
node-version: 20
59+
node-version: 24.8.0
6060
- run: npm ci
6161
- run: npx playwright install --with-deps
6262
- name: Wait for Codespace to be active
@@ -88,11 +88,13 @@ jobs:
8888
GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
8989
GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
9090
GITHUB_TOTP_SECRET: ${{ secrets.TEST_GITHUB_TOTP_SECRET }}
91+
PLAYWRIGHT_JUNIT_OUTPUT_NAME: ${{ github.workspace }}/test-report-acceptance-${{ inputs.flavor }}.xml
9192
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9293
if: always()
9394
with:
94-
name: playwright-artifacts
95+
name: test-results-acceptance-${{ inputs.flavor }}
9596
path: |
97+
test-report-*.xml
9698
test-results/
9799
retention-days: 10
98100
- run: |

.github/workflows/wc-build-push.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ jobs:
118118
DOCKER_METADATA_SET_OUTPUT_ENV: false
119119
with:
120120
images: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.flavor }}
121-
# Generate Docker tags based on the following events/attributes
121+
# Generate Docker tags based on the following events/attributes.
122+
# To prevent unnecessary image builds we simulate the `type=edge` tag
123+
# with `type=raw,value=edge,enable=...` which only enables the tag
124+
# for a `merge_group` event, this removes the need to build on `push`.
122125
tags: |
123-
type=edge
124-
type=raw,value=queue,enable=${{ github.event_name == 'merge_group' }}
126+
type=raw,value=edge,enable=${{ github.event_name == 'merge_group' }}
125127
type=ref,event=pr
126128
type=semver,pattern={{raw}}
127129
type=semver,pattern={{version}}

.github/workflows/wc-integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ jobs:
6262
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6363
if: always()
6464
with:
65-
name: test-results-${{ inputs.flavor }}-${{ inputs.runner }}
65+
name: test-results-integration-${{ inputs.flavor }}-${{ inputs.runner }}
6666
path: test-report-*.xml

test/cpp/features/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineConfig, devices } from '@playwright/test';
2-
import { defineBddConfig } from "playwright-bdd";
2+
import { defineBddConfig } from 'playwright-bdd';
33
import path from 'path';
44

55
require('dotenv').config({ path: path.join(__dirname, '..', '..', '..', '.env') });
@@ -17,7 +17,7 @@ export default defineConfig({
1717
forbidOnly: !!process.env.CI,
1818
retries: process.env.CI ? 2 : 0,
1919
workers: 1,
20-
reporter: 'list',
20+
reporter: process.env.CI ? 'junit' : 'list',
2121
use: {
2222
trace: 'on-first-retry'
2323
},

0 commit comments

Comments
 (0)