From 7ed8a46bbdbe4aae7e5efee7283967ec76e3b6f5 Mon Sep 17 00:00:00 2001 From: Tuncay Tunc Date: Wed, 19 Apr 2023 11:31:49 +0200 Subject: [PATCH 1/4] Extract the checkout and setup-java action into a re-usable action --- .../actions/publish-docker-image/action.yml | 10 +-- .../actions/run-deployment-test/action.yml | 10 +-- .github/workflows/build.yaml | 26 ++------ .github/workflows/business-tests.yaml | 10 +-- .github/workflows/deployment-test.yaml | 3 +- .github/workflows/draft-new-release.yaml | 9 +-- .github/workflows/helm-chart-release.yaml | 3 +- .github/workflows/helm-lint.yaml | 3 +- .github/workflows/kics.yml | 2 +- .github/workflows/publish-docker.yaml | 6 +- .github/workflows/publish-new-release.yml | 23 ++----- .github/workflows/trivy.yml | 6 +- .github/workflows/veracode.yaml | 30 ++------- .github/workflows/verify.yaml | 62 ++++--------------- 14 files changed, 46 insertions(+), 157 deletions(-) diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml index 206e13d4c..9061b11e7 100644 --- a/.github/actions/publish-docker-image/action.yml +++ b/.github/actions/publish-docker-image/action.yml @@ -41,8 +41,7 @@ inputs: runs: using: "composite" steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout ##################### # Login to DockerHub @@ -56,12 +55,7 @@ runs: ##################### # Build JAR file ##################### - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Build Controlplane shell: bash run: |- diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml index ed720b4be..ccca3e4ac 100644 --- a/.github/actions/run-deployment-test/action.yml +++ b/.github/actions/run-deployment-test/action.yml @@ -42,8 +42,7 @@ inputs: runs: using: "composite" steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - name: Cache ContainerD Image Layers uses: actions/cache@v3 @@ -51,12 +50,7 @@ runs: path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '11' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Build docker images shell: bash diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2c2dda9c2..6b9772ddd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -71,14 +71,8 @@ jobs: needs: [ secret-presence ] steps: # Set-Up - - name: Checkout - uses: actions/checkout@v3.3.0 - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/checkout + - uses: ./.github/actions/setup-java # Build - name: Build Extensions run: |- @@ -104,8 +98,7 @@ jobs: permissions: contents: write steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout - uses: ./.github/actions/publish-docker-image with: rootDir: edc-controlplane/${{ matrix.name }} @@ -128,8 +121,7 @@ jobs: permissions: contents: write steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout - uses: ./.github/actions/publish-docker-image with: rootDir: edc-dataplane/${{ matrix.name }} @@ -149,15 +141,9 @@ jobs: needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases' steps: # Set-Up - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Import GPG Key uses: crazy-max/ghaction-import-gpg@v5 with: diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml index 39caaadb1..f2089ae23 100644 --- a/.github/workflows/business-tests.yaml +++ b/.github/workflows/business-tests.yaml @@ -50,15 +50,9 @@ jobs: ### Set-Up ### ############## - - name: Checkout - uses: actions/checkout@v3.3.0 + uses: ./.github/actions/checkout - - name: Set-Up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + uses: ./.github/actions/setup-java - name: Cache ContainerD Image Layers uses: actions/cache@v3 diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml index 7d38b24ac..781ffc26e 100644 --- a/.github/workflows/deployment-test.yaml +++ b/.github/workflows/deployment-test.yaml @@ -47,8 +47,7 @@ jobs: deployment-test-memory: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - uses: ./.github/actions/run-deployment-test name: "Run deployment test using KinD and Helm" with: diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml index 248f61bc4..95f8e7b8e 100644 --- a/.github/workflows/draft-new-release.yaml +++ b/.github/workflows/draft-new-release.yaml @@ -18,7 +18,7 @@ jobs: pages: write pull-requests: write steps: - - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - name: Create release branch run: git checkout -b release/${{ github.event.inputs.version }} @@ -33,12 +33,7 @@ jobs: git config user.name "GitHub actions" git config user.email noreply@github.com - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + uses: ./.github/actions/setup-java - name: Bump version in gradle.properties run: |- diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml index bd5e55302..6b9bcdd45 100644 --- a/.github/workflows/helm-chart-release.yaml +++ b/.github/workflows/helm-chart-release.yaml @@ -38,8 +38,7 @@ jobs: steps: # fetch-depth: 0 is required to determine differences in chart(s) - - name: Checkout - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout with: fetch-depth: 0 diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml index ae94c84a7..6811ca2b7 100644 --- a/.github/workflows/helm-lint.yaml +++ b/.github/workflows/helm-lint.yaml @@ -26,8 +26,7 @@ jobs: ### Set-Up ### ############## - - name: Checkout - uses: actions/checkout@v3.3.0 + uses: ./.github/actions/checkout with: fetch-depth: 0 - diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index 1b922064a..25d8f1157 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -20,7 +20,7 @@ jobs: security-events: write steps: - - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - name: KICS scan uses: checkmarx/kics-github-action@v1.5 diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 794d15061..2cbc940a3 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -50,8 +50,7 @@ jobs: contents: write packages: write steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout - uses: ./.github/actions/publish-docker-image with: rootDir: edc-controlplane/${{ matrix.name }} @@ -74,8 +73,7 @@ jobs: contents: write packages: write steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout - uses: ./.github/actions/publish-docker-image with: rootDir: edc-dataplane/${{ matrix.name }} diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml index 373c892e7..2f3721e81 100644 --- a/.github/workflows/publish-new-release.yml +++ b/.github/workflows/publish-new-release.yml @@ -54,15 +54,9 @@ jobs: run: | echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV - - name: Checkout - uses: actions/checkout@v3.3.0 + uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + uses: ./.github/actions/setup-java - name: Import GPG Key uses: crazy-max/ghaction-import-gpg@v5 @@ -96,8 +90,7 @@ jobs: run: | echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV - - name: Checkout - uses: actions/checkout@v3.3.0 + uses: ./.github/actions/checkout with: fetch-depth: 0 - @@ -144,8 +137,7 @@ jobs: run: | echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV - - name: Checkout - uses: actions/checkout@v3.3.0 + uses: ./.github/actions/checkout with: # 0 to fetch the full history due to upcoming merge of releases into main branch fetch-depth: 0 @@ -177,12 +169,7 @@ jobs: draft: false prerelease: false - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + uses: ./.github/actions/setup-java - name: Merge releases back into main and set new snapshot version if: github.event.pull_request.base.ref == 'releases' diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index c315e8a07..c29c4015c 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -36,8 +36,7 @@ jobs: contents: read security-events: write steps: - - name: Checkout repository - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - name: Run Trivy vulnerability scanner in repo mode uses: aquasecurity/trivy-action@master with: @@ -72,8 +71,7 @@ jobs: - edc-dataplane-azure-vault - edc-dataplane-hashicorp-vault steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - name: Run Trivy vulnerability scanner if: always() uses: aquasecurity/trivy-action@master diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml index bba9df1b5..2893f7896 100644 --- a/.github/workflows/veracode.yaml +++ b/.github/workflows/veracode.yaml @@ -23,16 +23,10 @@ jobs: verify-formatting: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Verify proper formatting run: ./gradlew spotlessCheck @@ -51,14 +45,8 @@ jobs: - edc-controlplane-postgresql-hashicorp-vault steps: # Set-Up - - name: Checkout - uses: actions/checkout@v3.3.0 - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/checkout + - uses: ./.github/actions/setup-java # Build - name: Build Controlplane run: |- @@ -95,14 +83,8 @@ jobs: - edc-dataplane-hashicorp-vault steps: # Set-Up - - name: Checkout - uses: actions/checkout@v3.3.0 - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/checkout + - uses: ./.github/actions/setup-java # Build - name: Build Dataplane run: |- diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index d9dda3844..acaa8a0f4 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -58,15 +58,9 @@ jobs: verify-formatting: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Verify proper formatting run: ./gradlew spotlessCheck @@ -78,7 +72,7 @@ jobs: markdown-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: ./.github/actions/checkout - name: Install mardkdownlint run: npm install -g markdownlint-cli2 @@ -91,15 +85,9 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Run Unit tests run: ./gradlew test @@ -108,15 +96,9 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Run Integration tests run: ./gradlew test -DincludeTags="ComponentTest" @@ -125,15 +107,9 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Run API tests run: ./gradlew test -DincludeTags="ApiTest" @@ -142,15 +118,9 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Run E2E tests run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest" @@ -162,16 +132,10 @@ jobs: runs-on: ubuntu-latest steps: # Set-Up - - name: Checkout - uses: actions/checkout@v3.3.0 + - uses: ./.github/actions/checkout with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' + - uses: ./.github/actions/setup-java - name: Cache SonarCloud packages uses: actions/cache@v3 with: From ce01749791c51099d58bc8154c8ed71566faa35f Mon Sep 17 00:00:00 2001 From: Tuncay Tunc Date: Wed, 19 Apr 2023 11:52:27 +0200 Subject: [PATCH 2/4] Commit actions. --- .github/actions/checkout/action.yml | 34 +++++++++++++++++++++++++++ .github/actions/setup-java/action.yml | 32 +++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 .github/actions/checkout/action.yml create mode 100644 .github/actions/setup-java/action.yml diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml new file mode 100644 index 000000000..30dcbba48 --- /dev/null +++ b/.github/actions/checkout/action.yml @@ -0,0 +1,34 @@ +# +# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +# Copyright (c) 2023 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +name: "Checkout" +description: "Checks out the repository" +inputs: + fetch-depth: + required: false + description: "Fetch-depth" +runs: + using: "composite" + steps: + - uses: ./.github/actions/checkout + with: + fetch-depth: ${{ inputs.fetch-depth }} + diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml new file mode 100644 index 000000000..ed03fafb3 --- /dev/null +++ b/.github/actions/setup-java/action.yml @@ -0,0 +1,32 @@ +# +# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +# Copyright (c) 2023 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +name: "Setup JDK 17" +description: "Setup JDK 17" +runs: + using: "composite" + steps: + - name: Setup JDK 17 + uses: actions/setup-java@v3.11.0 + with: + java-version: '17' + distribution: 'temurin' + cache: 'gradle' \ No newline at end of file From 7b72951bd19b30501848c406721378f69a78babc Mon Sep 17 00:00:00 2001 From: Tuncay Tunc Date: Wed, 19 Apr 2023 12:15:08 +0200 Subject: [PATCH 3/4] fix action --- .github/actions/checkout/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index 30dcbba48..253fde3ce 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -28,7 +28,7 @@ inputs: runs: using: "composite" steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 with: fetch-depth: ${{ inputs.fetch-depth }} From 94ee1b4b052a97a6b13ec85e0b6297e5a601df9a Mon Sep 17 00:00:00 2001 From: Tuncay Tunc Date: Wed, 19 Apr 2023 12:35:02 +0200 Subject: [PATCH 4/4] remove checkout extraction --- .github/actions/checkout/action.yml | 34 ------------------- .../actions/publish-docker-image/action.yml | 2 +- .../actions/run-deployment-test/action.yml | 2 +- .github/workflows/build.yaml | 8 ++--- .github/workflows/business-tests.yaml | 2 +- .github/workflows/deployment-test.yaml | 2 +- .github/workflows/draft-new-release.yaml | 2 +- .github/workflows/helm-chart-release.yaml | 2 +- .github/workflows/helm-lint.yaml | 2 +- .github/workflows/kics.yml | 2 +- .github/workflows/publish-docker.yaml | 4 +-- .github/workflows/publish-new-release.yml | 6 ++-- .github/workflows/trivy.yml | 4 +-- .github/workflows/veracode.yaml | 6 ++-- .github/workflows/verify.yaml | 14 ++++---- 15 files changed, 29 insertions(+), 63 deletions(-) delete mode 100644 .github/actions/checkout/action.yml diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml deleted file mode 100644 index 253fde3ce..000000000 --- a/.github/actions/checkout/action.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -name: "Checkout" -description: "Checks out the repository" -inputs: - fetch-depth: - required: false - description: "Fetch-depth" -runs: - using: "composite" - steps: - - uses: actions/checkout@v3.3.0 - with: - fetch-depth: ${{ inputs.fetch-depth }} - diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml index 9061b11e7..2f8a8c522 100644 --- a/.github/actions/publish-docker-image/action.yml +++ b/.github/actions/publish-docker-image/action.yml @@ -41,7 +41,7 @@ inputs: runs: using: "composite" steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 ##################### # Login to DockerHub diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml index ccca3e4ac..9f4b40d58 100644 --- a/.github/actions/run-deployment-test/action.yml +++ b/.github/actions/run-deployment-test/action.yml @@ -42,7 +42,7 @@ inputs: runs: using: "composite" steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - name: Cache ContainerD Image Layers uses: actions/cache@v3 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 646625aa1..0713b0857 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -71,7 +71,7 @@ jobs: needs: [ secret-presence ] steps: # Set-Up - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java # Build - name: Build Extensions @@ -98,7 +98,7 @@ jobs: permissions: contents: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/publish-docker-image with: rootDir: edc-controlplane/${{ matrix.name }} @@ -121,7 +121,7 @@ jobs: permissions: contents: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/publish-docker-image with: rootDir: edc-dataplane/${{ matrix.name }} @@ -141,7 +141,7 @@ jobs: needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases' steps: # Set-Up - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java - name: Import GPG Key diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml index f2089ae23..a4726a443 100644 --- a/.github/workflows/business-tests.yaml +++ b/.github/workflows/business-tests.yaml @@ -50,7 +50,7 @@ jobs: ### Set-Up ### ############## - - uses: ./.github/actions/checkout + uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java - diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml index 781ffc26e..8e75ae31e 100644 --- a/.github/workflows/deployment-test.yaml +++ b/.github/workflows/deployment-test.yaml @@ -47,7 +47,7 @@ jobs: deployment-test-memory: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/run-deployment-test name: "Run deployment test using KinD and Helm" with: diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml index 3b77c9871..98e3c956a 100644 --- a/.github/workflows/draft-new-release.yaml +++ b/.github/workflows/draft-new-release.yaml @@ -18,7 +18,7 @@ jobs: pages: write pull-requests: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - name: Create release branch run: git checkout -b release/${{ github.event.inputs.version }} diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml index 6b9bcdd45..f19c841b9 100644 --- a/.github/workflows/helm-chart-release.yaml +++ b/.github/workflows/helm-chart-release.yaml @@ -38,7 +38,7 @@ jobs: steps: # fetch-depth: 0 is required to determine differences in chart(s) - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 with: fetch-depth: 0 diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml index 2e07f115d..0b5a70f1f 100644 --- a/.github/workflows/helm-lint.yaml +++ b/.github/workflows/helm-lint.yaml @@ -26,7 +26,7 @@ jobs: ### Set-Up ### ############## - - uses: ./.github/actions/checkout + uses: actions/checkout@v3.3.0 with: fetch-depth: 0 - diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index 25d8f1157..1b922064a 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -20,7 +20,7 @@ jobs: security-events: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - name: KICS scan uses: checkmarx/kics-github-action@v1.5 diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 2cbc940a3..24aaf2ff4 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -50,7 +50,7 @@ jobs: contents: write packages: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/publish-docker-image with: rootDir: edc-controlplane/${{ matrix.name }} @@ -73,7 +73,7 @@ jobs: contents: write packages: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/publish-docker-image with: rootDir: edc-dataplane/${{ matrix.name }} diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml index a2dd440b4..b7de21257 100644 --- a/.github/workflows/publish-new-release.yml +++ b/.github/workflows/publish-new-release.yml @@ -54,7 +54,7 @@ jobs: run: | echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV - - uses: ./.github/actions/checkout + uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java @@ -90,7 +90,7 @@ jobs: run: | echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV - - uses: ./.github/actions/checkout + uses: actions/checkout@v3.3.0 with: fetch-depth: 0 - @@ -137,7 +137,7 @@ jobs: run: | echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV - - uses: ./.github/actions/checkout + uses: actions/checkout@v3.3.0 with: # 0 to fetch the full history due to upcoming merge of releases into main branch fetch-depth: 0 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 988f9f38a..2fe44c399 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -36,7 +36,7 @@ jobs: contents: read security-events: write steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - name: Run Trivy vulnerability scanner in repo mode uses: aquasecurity/trivy-action@master with: @@ -71,7 +71,7 @@ jobs: - edc-dataplane-azure-vault - edc-dataplane-hashicorp-vault steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 ## This step will fail if the docker images is not found - name: "Check if image exists" diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml index d042c60f7..486c53096 100644 --- a/.github/workflows/veracode.yaml +++ b/.github/workflows/veracode.yaml @@ -23,7 +23,7 @@ jobs: verify-formatting: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 with: fetch-depth: 0 - uses: ./.github/actions/setup-java @@ -45,7 +45,7 @@ jobs: - edc-controlplane-postgresql-hashicorp-vault steps: # Set-Up - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java # Build - name: Build Controlplane @@ -83,7 +83,7 @@ jobs: - edc-dataplane-hashicorp-vault steps: # Set-Up - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java # Build - name: Build Dataplane diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index dfd26b4c9..2cd0432f8 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -58,7 +58,7 @@ jobs: verify-formatting: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java - name: Verify proper formatting @@ -72,7 +72,7 @@ jobs: markdown-lint: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - name: Install mardkdownlint run: npm install -g markdownlint-cli2 @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java @@ -96,7 +96,7 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java @@ -118,7 +118,7 @@ jobs: runs-on: ubuntu-latest needs: [ verify-formatting ] steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 - uses: ./.github/actions/setup-java @@ -132,7 +132,7 @@ jobs: runs-on: ubuntu-latest steps: # Set-Up - - uses: ./.github/actions/checkout + - uses: actions/checkout@v3.3.0 with: fetch-depth: 0 - uses: ./.github/actions/setup-java