Ensure to fetch HEAD when building image

bkd-mba-fbi · Feb 1, 2024 · f7fa43e · f7fa43e
1 parent b0dca9a
commit f7fa43e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/actions/merge-ff-only/action.yml b/.github/workflows/actions/merge-ff-only/action.yml
@@ -16,7 +16,9 @@ runs:
       shell: bash
     - run: git merge --ff-only origin/${{ inputs.base-ref }}
       shell: bash
-    - run: git log -n 1 --tags
+    - run: echo "Latest commit:" && git log -n 1
+      shell: bash
+    - run: echo "Latest tag:" && git log -n 1 --tags
       shell: bash
     - run: git push
       shell: bash
diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
@@ -65,6 +65,12 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v4
+        with:
+          # Make sure we actually fetch the HEAD with the previously
+          # merged commits from main, instead of the latest commit of
+          # the release branch at the time this workflow has been
+          # started (before merge)
+          ref: HEAD
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3