Merge pull request #21 from calebjenkins/develop

add push to main workflow - pull_requests results in a push event when merged
calebjenkins · Sep 4, 2023 · 35edae4 · 35edae4
2 parents bdb0e96 + 68b4381
commit 35edae4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -78,10 +78,9 @@ jobs:
             run: echo "Build number is $GITHUB_RUN_NUMBER "
 
           # workflow_dispatch  pull_request  push
-          - name: Print Triggering Event
+          - name: Print Triggering github.Event_Name
             run: echo ${{ github.event_name }}
-
-
+
           - name: Detect if workflow is running on origin/Develop
             id: detect_develop
             run: git rev-parse HEAD | grep $(git rev-parse origin/develop)

diff --git a/.github/workflows/main-publish.yml b/.github/workflows/main-publish.yml
@@ -95,7 +95,7 @@ jobs:
 
             # workflow_dispatch  pull_request  push
           - name: Push to Nuget
-            if: ( github.event_name == 'workflow_dispatch' && github.event.inputs.PublishNuget == 'true') || ( github.event_name == 'pull_request' && (!contains(github.event.pull_request.title, 'no-publish')))
+            if: ( github.event_name == 'workflow_dispatch' && github.event.inputs.PublishNuget == 'true') || ( github.event_name == 'pull_request' && (!contains(github.event.pull_request.title, 'no-publish'))) || ( github.event_name == 'push' && (!contains(github.event.pull_request.title, 'no-publish')))
             # if: ${{ (github.ref == 'refs/heads/main') && ((github.event.inputs.PublishNuget == true) && (!contains(github.event.pull_request.title, 'no-publish'))) }}
             # if: ${{ steps.detect_branch.outcome == 'success' }}
             # if: ${{ github.event.inputs.PublishNuget == 'true'}}