Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix containerize-uberjar workflow failing on pull requests (#69346)

Nemanja Glumace2e2c7016521
diff --git a/.github/workflows/containerize-uberjar.yml b/.github/workflows/containerize-uberjar.yml
index 97bc3b621fa..3fa294c1653 100644
--- a/.github/workflows/containerize-uberjar.yml
+++ b/.github/workflows/containerize-uberjar.yml
@@ -56,12 +56,12 @@ jobs:
secrets: inherit
with:
edition: ${{ matrix.edition }}
- commit: ${{ github.event.inputs.commit || github.sha }}
+ commit: ${{ github.event.inputs.commit || github.event.pull_request.head.sha || github.sha }}
repo: ${{ fromJson(needs.get-container-info.outputs[matrix.edition]).repo }}
tag: ${{ fromJson(needs.get-container-info.outputs[matrix.edition]).tag }}
release: "false"
build-args: |
- GIT_COMMIT_SHA=${{ github.event.inputs.commit || github.sha }}
+ GIT_COMMIT_SHA=${{ github.event.inputs.commit || github.event.pull_request.head.sha || github.sha }}
run-trivy:
needs: [get-container-info, containerize]
@@ -74,7 +74,7 @@ jobs:
- name: Check out the code
uses: actions/checkout@v4
with:
- ref: ${{ github.event.inputs.commit || github.sha }}
+ ref: ${{ github.event.inputs.commit || github.event.pull_request.head.sha || github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/[email protected]
env: