refine versionlog check and bump versionlog

SciLifeLab · Apr 22, 2024 · 3a7ed18 · 3a7ed18
1 parent 073538d
commit 3a7ed18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/check-log.yml b/.github/workflows/check-log.yml
@@ -12,12 +12,8 @@ jobs:
 
       - name: Check for VERSIONLOG.MD changes
         id: versionlog_check
-        # 1) Find the common ancestor between the current HEAD and the base branch
-        # 2) Then see if the versionlog has been updated in the PR since it diverged
-        #    from the common ancestor
         run: |
-          PR_BASE_SHA=$(git merge-base HEAD ${{ github.event.pull_request.base.sha }})
-          FILE_CHANGED=$(git diff --name-only $PR_BASE_SHA HEAD | grep 'VERSIONLOG.md' || true)
+          FILE_CHANGED=$(git diff --name-only ${{ github.event.pull_request.base.sha }} HEAD | grep 'VERSIONLOG.md' || true)
           if [ -n "$FILE_CHANGED" ]; then
             echo "VERSIONLOG.MD has been changed."
           else

diff --git a/VERSIONLOG.md b/VERSIONLOG.md
@@ -1,5 +1,9 @@
 # TACA Version Log
 
+## 20240422.1
+
+Refine GHA VERSIONLOG.md check to compare to merge-base, not branch-base.
+
 ## 20240410.1
 
 Expand test coverage by starting and checking demultiplexing for a NovaSeqXPlus run.