From 049c46e5762116c7930d880a51a97c2588e823de Mon Sep 17 00:00:00 2001 From: Jaro Hartmann <57985712+ds-jhartmann@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:40:12 +0200 Subject: [PATCH] chore: [TRX-19] migrate upstream GitHub workflows and configs (#2) (cherry picked from commit 32beedaff3a4db9a5ad3e2d72904bb70472e54f1) --- .github/workflows/cucumber-integration-test-UMBRELLA.yaml | 2 +- .github/workflows/irs-build.yml | 4 ++++ .github/workflows/release.yaml | 2 +- .github/workflows/tavern-UMBRELLA.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cucumber-integration-test-UMBRELLA.yaml b/.github/workflows/cucumber-integration-test-UMBRELLA.yaml index ded32f7e3..d13a8093c 100644 --- a/.github/workflows/cucumber-integration-test-UMBRELLA.yaml +++ b/.github/workflows/cucumber-integration-test-UMBRELLA.yaml @@ -44,7 +44,7 @@ concurrency: jobs: execute-e2e-tests: - runs-on: tractusx-runner + runs-on: "${{ github.repository == 'eclipse-tractusx/item-relationship-service' && 'tractusx-runner' || 'ubuntu-latest' }}" steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/irs-build.yml b/.github/workflows/irs-build.yml index e04ffd449..a7c6131ed 100644 --- a/.github/workflows/irs-build.yml +++ b/.github/workflows/irs-build.yml @@ -165,6 +165,10 @@ jobs: trigger-trivy-image-scan: if: github.event_name != 'pull_request' + permissions: + actions: read + contents: read + security-events: write needs: - build_images uses: ./.github/workflows/trivy-docker-hub-scan.yml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d30f9597b..9da381260 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -73,7 +73,7 @@ jobs: # insert new comparison below uppermost one sed -i "$((latest_comparison_url_line_number+1)) s|^|[${{ inputs.irs-version }}]: \ - https://github.com/eclipse-tractusx/item-relationship-service/compare/$previous_irs_version...${{ inputs.irs-version }}\n|" ${{ env.CHANGELOG_PATH }} + ${{ github.server_url }}/${{ github.repository }}/compare/$previous_irs_version...${{ inputs.irs-version }}\n|" ${{ env.CHANGELOG_PATH }} # replace placeholder placeholder_line_number=$(cat -n ${{ env.CHANGELOG_PATH }} | grep -Eoi "[0-9]+.## \[Unreleased\]" | grep -Eo "[0-9]+") diff --git a/.github/workflows/tavern-UMBRELLA.yml b/.github/workflows/tavern-UMBRELLA.yml index 6b49c8595..48cf0d495 100644 --- a/.github/workflows/tavern-UMBRELLA.yml +++ b/.github/workflows/tavern-UMBRELLA.yml @@ -31,7 +31,7 @@ concurrency: jobs: test: - runs-on: tractusx-runner + runs-on: "${{ github.repository == 'eclipse-tractusx/item-relationship-service' && 'tractusx-runner' || 'ubuntu-latest' }}" steps: - uses: actions/checkout@v4