From e682d202a8169f66e921148ab4502e277b80bc32 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 7 Sep 2022 14:36:15 +0200 Subject: [PATCH] update paths to Dockerfile --- .github/workflows/deploy-production.yml | 2 +- .github/workflows/deploy-release.yml | 6 +++--- action.yml | 6 +++++- Dockerfile => core/Dockerfile | 0 {src => core/src}/functions.sh | 0 {src => core/src}/index.sh | 0 src | 1 + 7 files changed, 10 insertions(+), 5 deletions(-) rename Dockerfile => core/Dockerfile (100%) rename {src => core/src}/functions.sh (100%) rename {src => core/src}/index.sh (100%) create mode 120000 src diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 77ec7520..94aab2b0 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -60,7 +60,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: ./Dockerfile + file: ./core/Dockerfile build-args: | BUILD_DATE=${{ env.BUILD_DATE }} BUILD_REVISION=${{ github.sha }} diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 87c0c51d..07db3d0d 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -73,17 +73,17 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: ./Dockerfile + file: ./core/Dockerfile build-args: | BUILD_DATE=${{ env.BUILD_DATE }} BUILD_REVISION=${{ github.sha }} BUILD_VERSION=${{ github.sha }} load: false push: true - # !FIXME - Avoid using hardcoded `v3` + # !FIXME - Avoid using hardcoded `v4` tags: | ${{ env.REGISTRY }}/${{ github.repository }}:${{ matrix.images.container-image-id-prefix }}latest - ${{ env.REGISTRY }}/${{ github.repository }}:${{ matrix.images.container-image-id-prefix }}v3 + ${{ env.REGISTRY }}/${{ github.repository }}:${{ matrix.images.container-image-id-prefix }}v4 ${{ env.REGISTRY }}/${{ github.repository }}:${{ matrix.images.container-image-id-prefix }}${{ env.RELEASE_VERSION }} - name: Update deployment status diff --git a/action.yml b/action.yml index f345a9ff..089d535e 100644 --- a/action.yml +++ b/action.yml @@ -52,7 +52,11 @@ runs: severity: ${{ inputs.severity }} token: ${{ inputs.token }} - - if: ${{ inputs.token }} + - shell: bash + run: | + echo "SARIF:" && cat ${{ steps.core.outputs.PATH_TO_SARIF }} + + - if: ${{ inputs.token && always() }} name: Upload SARIF uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b with: diff --git a/Dockerfile b/core/Dockerfile similarity index 100% rename from Dockerfile rename to core/Dockerfile diff --git a/src/functions.sh b/core/src/functions.sh similarity index 100% rename from src/functions.sh rename to core/src/functions.sh diff --git a/src/index.sh b/core/src/index.sh similarity index 100% rename from src/index.sh rename to core/src/index.sh diff --git a/src b/src new file mode 120000 index 00000000..fcb240cd --- /dev/null +++ b/src @@ -0,0 +1 @@ +./core/src \ No newline at end of file