From f8682adb2a66cdf32a032ab98789328c15719adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Tue, 27 May 2025 10:23:10 +0200 Subject: [PATCH] chore: use ternary operator to avoid "skipped" integration test job --- .github/workflows/integration-test.yaml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 3878286ea5..9e5746103d 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -2,10 +2,10 @@ name: Integration Tests on: push: - branches: + branches: - main pull_request_target: - branches: + branches: - main workflow_dispatch: @@ -16,8 +16,7 @@ permissions: jobs: test: - if: github.event_name == 'push' - name: Run tests + name: Run uses: open-component-model/ocm-integrationtest/.github/workflows/integrationtest.yaml@main permissions: contents: write @@ -25,17 +24,5 @@ jobs: packages: write secrets: inherit with: - ref: ${{ github.ref }} - repo: ${{ github.repository }} - test-pr: - if: github.event_name == 'pull_request_target' - name: Run tests - uses: open-component-model/ocm-integrationtest/.github/workflows/integrationtest.yaml@main - permissions: - contents: write - id-token: write - packages: write - secrets: inherit - with: - ref: ${{ github.event.pull_request.head.ref }} - repo: ${{ github.event.pull_request.head.repo.full_name }} \ No newline at end of file + ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.ref || github.ref }} + repo: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name || github.repository }} \ No newline at end of file