From 30763f8591a919ed7852a940556b32a4ba4513ce Mon Sep 17 00:00:00 2001 From: Jaspar Stach Date: Thu, 5 Sep 2024 08:20:28 +0200 Subject: [PATCH 1/2] Add: Special VTs case for unpacking artifact --- .github/workflows/container-build-push-feed.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/container-build-push-feed.yml b/.github/workflows/container-build-push-feed.yml index dc40b44..54fd9d2 100644 --- a/.github/workflows/container-build-push-feed.yml +++ b/.github/workflows/container-build-push-feed.yml @@ -38,6 +38,10 @@ on: description: "The artifact path to extract the artifact into." required: false type: string + vts: + description: "Is this the vts image?" + default: false + type: string secrets: COSIGN_KEY_OPENSIGHT: @@ -77,6 +81,12 @@ jobs: name: ${{ inputs.artifact-name }} path: ${{ inputs.artifact-path }} + - name: Unpack vulnerability-tests feed content + if: inputs.vts == 'true' + run: | + cd ${{ inputs.artifact-path }} + tar -xJf vulnerability-tests.tar.xz + - name: Container build and push 2nd gen id: build-and-push uses: greenbone/actions/container-build-push-generic@v3 From 562f74d933275d56bf77b276b842259a7e05311f Mon Sep 17 00:00:00 2001 From: Jaspar Stach Date: Thu, 5 Sep 2024 08:53:19 +0200 Subject: [PATCH 2/2] Update container-build-push-feed.yml --- .github/workflows/container-build-push-feed.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container-build-push-feed.yml b/.github/workflows/container-build-push-feed.yml index 54fd9d2..acdbd83 100644 --- a/.github/workflows/container-build-push-feed.yml +++ b/.github/workflows/container-build-push-feed.yml @@ -75,7 +75,8 @@ jobs: with: ref: ${{ inputs.ref-name }} - - uses: actions/download-artifact@v4 + - name: Download Artifact ${{ inputs.artifact-name }} to ${{ inputs.artifact-path }} + uses: actions/download-artifact@v4 if: inputs.artifact-name with: name: ${{ inputs.artifact-name }} @@ -115,12 +116,19 @@ jobs: with: ref: ${{ inputs.ref-name }} - - uses: actions/download-artifact@v4 + - name: Download Artifact ${{ inputs.artifact-name }} to ${{ inputs.artifact-path }} + uses: actions/download-artifact@v4 if: inputs.artifact-name with: name: ${{ inputs.artifact-name }} path: ${{ inputs.artifact-path }} + - name: Unpack vulnerability-tests feed content + if: inputs.vts == 'true' + run: | + cd ${{ inputs.artifact-path }} + tar -xJf vulnerability-tests.tar.xz + - name: Container build and push 3rd gen id: build-and-push uses: greenbone/actions/container-build-push-generic@v3