Update workflows [skip ci]

realitycollective · May 7, 2024 · 618c1f7 · 618c1f7
1 parent 88abe07
commit 618c1f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/development-publish.yml b/.github/workflows/development-publish.yml
@@ -1,12 +1,9 @@
 name: Publish development branch on Merge
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - development
-  # Ignore PRs targeting main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -17,7 +14,6 @@ concurrency:
 
 jobs:
   release_on_merge:
-    if: github.event.pull_request.merged == true
     name: Tag and Publish UPM package
     uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2
     with:

diff --git a/.github/workflows/main-publish.yml b/.github/workflows/main-publish.yml
@@ -1,16 +1,17 @@
 name: Publish main branch and increment version
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - main
 
+  # Allows you to run this workflow manually from the Actions tab, last resort if GitHub does not behave
+  workflow_dispatch:
+
 jobs:
   # Get Version to tag and release the branch, no up-version - [no-ver] included in PR title
   validate-environment:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver')
+    if: contains(github.event.head_commit.message, 'no-ver')
     name: Get Version from UPM package
     uses: realitycollective/reusableworkflows/.github/workflows/getpackageversionfrompackage.yml@v2
     with:
@@ -28,7 +29,7 @@ jobs:
 
   # Up version the release and publish major release
   upversion-major-Package:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'major-release')
+    if: contains(github.event.head_commit.message, 'no-ver') == false && contains(github.event.head_commit.message, 'major-release')
     name: Major Version package and release
     uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2
     with:
@@ -38,7 +39,7 @@ jobs:
 
   # Up version the release and publish minor release
   upversion-minor-Package:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'minor-release')
+    if: contains(github.event.head_commit.message, 'no-ver') == false && contains(github.event.head_commit.message, 'minor-release')
     name: Minor Version package and release
     uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2
     with:
@@ -48,7 +49,7 @@ jobs:
 
   # Up version the release and publish patch release (default)
   upversion-patch-Package:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'no-ver') == false && contains(github.event.pull_request.title, 'minor-release') == false && contains(github.event.pull_request.title, 'major-release') == false
+    if: contains(github.event.head_commit.message, 'no-ver') == false && contains(github.event.head_commit.message, 'minor-release') == false && contains(github.event.head_commit.message, 'major-release') == false
     name: Patch Version package and release
     uses: realitycollective/reusableworkflows/.github/workflows/upversionandtagrelease.yml@v2
     with: