From 514463addf9e118ce153d7b8b2693a0562e21296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20L=C3=B6nnegren?= Date: Fri, 9 Feb 2024 10:31:25 +0100 Subject: [PATCH] Use pull_request_target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Lönnegren --- .github/workflows/build_and_test_x86.yaml | 10 ++++++++++ .github/workflows/pr.yaml | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test_x86.yaml b/.github/workflows/build_and_test_x86.yaml index 687ffba61cf..dc10123ccb9 100644 --- a/.github/workflows/build_and_test_x86.yaml +++ b/.github/workflows/build_and_test_x86.yaml @@ -23,6 +23,8 @@ jobs: REPO: ghcr.io/${{ github.repository }}/elemental-${{ inputs.flavor }} steps: - uses: actions/checkout@v4 + with: + ref: "${{ github.event.pull_request.merge_commit_sha }}" - run: | git fetch --prune --unshallow - name: Log in to registry @@ -50,6 +52,8 @@ jobs: REPO: ghcr.io/${{ github.repository }}/elemental-${{ inputs.flavor }} steps: - uses: actions/checkout@v4 + with: + ref: "${{ github.event.pull_request.merge_commit_sha }}" - run: | git fetch --prune --unshallow - name: Cached ISO @@ -87,6 +91,8 @@ jobs: ARCH: x86_64 steps: - uses: actions/checkout@v4 + with: + ref: "${{ github.event.pull_request.merge_commit_sha }}" - run: | git fetch --prune --unshallow - name: Checks cached Disk @@ -152,6 +158,8 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 + with: + ref: "${{ github.event.pull_request.merge_commit_sha }}" - name: Install Go uses: actions/setup-go@v5 with: @@ -209,6 +217,8 @@ jobs: COS_TIMEOUT: 1600 steps: - uses: actions/checkout@v4 + with: + ref: "${{ github.event.pull_request.merge_commit_sha }}" - name: Install Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1bd2d453b2f..da87363909c 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,6 +1,6 @@ name: PR on: - pull_request: + pull_request_target: paths: - tests/** - make/** @@ -35,6 +35,8 @@ jobs: TOOLKIT_REPO: ghcr.io/${{github.repository}}/elemental-cli steps: - uses: actions/checkout@v4 + with: + ref: "${{ github.event.pull_request.merge_commit_sha }}" - run: | git fetch --prune --unshallow - name: Log in to ghcr.io