Skip to content

Commit 7fd1fb5

Browse files
Merge remote-tracking branch 'remotes/from/ce/main'
2 parents 935afc7 + 163df7f commit 7fd1fb5

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

‎.github/actions/checkout/action.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ outputs:
2020
ref:
2121
description: The git reference that was checked out.
2222
value: ${{ steps.ref.outputs.ref }}
23+
sha:
24+
description: The commit SHA that was checked out.
25+
value: ${{ steps.sha.outputs.sha }}
2326
depth:
2427
description: The fetch depth that was checked out.
25-
value: ${{ steps.ref.outputs.ref }}
28+
value: ${{ steps.ref.outputs.depth }}
2629

2730
runs:
2831
using: composite
@@ -75,3 +78,8 @@ runs:
7578
path: ${{ inputs.path }}
7679
fetch-depth: ${{ steps.ref.outputs.depth }}
7780
ref: ${{ steps.ref.outputs.ref }}
81+
- id: sha
82+
shell: bash
83+
env:
84+
CHECKOUT_PATH: ${{ inputs.path }}
85+
run: echo "sha=$(git -C "${CHECKOUT_PATH:-.}" rev-parse HEAD)" | tee -a "$GITHUB_OUTPUT"

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
outputs:
9595
build-date: ${{ steps.metadata.outputs.vault-build-date }}
9696
changed-files: ${{ steps.changed-files.outputs.changed-files }}
97-
checkout-ref: ${{ steps.checkout.outputs.ref }}
97+
checkout-ref: ${{ steps.checkout.outputs.sha }}
9898
compute-build: ${{ steps.metadata.outputs.compute-build }}
9999
compute-build-ui: ${{ steps.metadata.outputs.compute-build-ui }}
100100
compute-small: ${{ steps.metadata.outputs.compute-small }}

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
pull-requests: read
3333
outputs:
3434
changed-files: ${{ steps.changed-files.outputs.changed-files }}
35-
checkout-ref: ${{ steps.checkout.outputs.ref }}
35+
checkout-ref: ${{ steps.checkout.outputs.sha }}
3636
compute-build: ${{ steps.metadata.outputs.compute-build }}
3737
compute-small: ${{ steps.metadata.outputs.compute-small }}
3838
compute-test-go: ${{ steps.metadata.outputs.compute-test-go }}

0 commit comments

Comments
 (0)