Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ name: CI

on:
workflow_dispatch:
push:
branches: [main]
merge_group:
pull_request:
branches: [main]

permissions:
contents: read
packages: read

jobs:
test:
runs-on: ubuntu-latest
Expand All @@ -17,6 +20,7 @@ jobs:
matrix:
node-version: [22, 24]
cds-version: [8, 9, latest]
exclude: ${{ github.event_name == 'merge_group' && fromJSON('[]') || fromJSON('[{"node-version":22,"cds-version":8},{"node-version":22,"cds-version":9},{"node-version":22,"cds-version":"latest"},{"node-version":24,"cds-version":8},{"node-version":24,"cds-version":9}]') }}
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -82,3 +86,12 @@ jobs:
- run: cds v -i
- run: cds bind -2 joule-cap-proxy -o package.json
- run: npm run test:hybrid

summary:
if: always()
runs-on: ubuntu-latest
name: Summary
needs: [test, test-hybrid]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the hybrid test result from the PR checks reused in the merge queue or does it need to run again?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case it's run again. I'd prefer to move hybrid checks to merge queue only if you're okay with not having the PR checks.

steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
Loading