check that a commit is not in the develop history before running the … (

#26)

* check that a commit is not in the develop history before running the version check #25

* version bump

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,8 +4,8 @@
 ⚠️ Add a note to /CHANGELOG.md with your version number and the date, summarizing the changes.
 ⚠️ If your pull request fixes an open issue, please link to the issue.
 ⚠️ Rebase the latest changes from the develop branch. Assuming origin points to https://github.com/AgnostiqHQ/covalent, you should run git rebase origin/develop.
+-->
 
 - [ ] I have added the tests to cover my changes.
 - [ ] I have updated the documentation, VERSION, and CHANGELOG accordingly.
 - [ ] I have read the CONTRIBUTING document.
--->

.github/workflows/version.yml

@@ -36,11 +36,18 @@ jobs:
         uses: actions/checkout@v1
         with:
           fetch-depth: 0
+      - name: Check git history
+        run: |
+          if git merge-base --is-ancestor $GITHUB_SHA origin/develop; then
+            echo "DEVELOP_COMMIT_HISTORY=$GITHUB_SHA" >> $GITHUB_ENV
+          fi
       - name: Read head version
+        if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }}
         run: |
           HEAD_VERSION="$(cat ./VERSION)"
           echo "HEAD_VERSION=$HEAD_VERSION" >> $GITHUB_ENV
       - name: Validate changelog entry
+        if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }}
         run: |
           git diff --name-only origin/develop | grep CHANGELOG
           if [[ $(grep -c "\b${HEAD_VERSION}\b" CHANGELOG.md) > 1 ]]; then
@@ -58,12 +65,15 @@ jobs:
             exit 3
           fi
       - name: Check out base
+        if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }}
         run: git checkout develop
       - name: Read base version
+        if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }}
         run: |
           BASE_VERSION="$(cat ./VERSION)"
           echo "BASE_VERSION=$BASE_VERSION" >> $GITHUB_ENV
       - name: Validate version change
+        if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }}
         run: |
           echo "head version is ${HEAD_VERSION}"
           echo "base version is ${BASE_VERSION}"

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.22.9] - 2022-01-27
+
+### Fixed
+
+- Fixing version check action so that it doesn't run on commits that are in develop
+- Edited PR template so that markdown checklist appears properly
+
 ## [0.22.8] - 2022-01-27
 
 ### Fixed

VERSION

@@ -1 +1 @@
-0.22.8
+0.22.9