Merge pull request #5 from ESMCI/bumpversion_again

update documentation in bumpversion
ESMCI · Dec 3, 2023 · 9b8ddf4 · 9b8ddf4
2 parents 974d7c3 + 61a01dd
commit 9b8ddf4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml
@@ -1,4 +1,6 @@
-# This action requires that the branch protection for main do not require a pull request before merging.
+# This action requires that the branch protection for main are turned off.
+# Documented in https://stackoverflow.com/questions/74128344/github-protected-branch-hook-declined-even-with-allow-force-pushes
+# If you know a way around this I would be happy to apply it.
 name: Update file on PR merge
 on:
   pull_request:

diff --git a/version.inc b/version.inc
@@ -1 +1 @@
-character(len=*), parameter :: version="v1.0.1"
+character(len=*), parameter :: version="v1.0.2"\n
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		character(len=*), parameter :: version="v1.0.1"
		character(len=*), parameter :: version="v1.0.2"\n