chore: another GHA tweak

BloomBooks · Nov 12, 2024 · 7486250 · 7486250
1 parent 2a3afd7
commit 7486250
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,6 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npx semantic-release
 
-        # This doesn't work
-        #   - name: Set output if new release published to npm
-        #     if: success() && steps.semantic_release.outputs.new_release_published == 'true'
-        #     run: echo "::set-output name=new_release_published::true"
+      - name: Set output if new release published to npm
+        if: success() && (startsWith(github.event.head_commit.message, 'fix:') || startsWith(github.event.head_commit.message, 'feat:'))
+        run: echo "::set-output name=new_release_published::true"
diff --git a/.github/workflows/trigger-teamcity-builds.yml b/.github/workflows/trigger-teamcity-builds.yml
@@ -11,9 +11,7 @@ jobs:
   trigger-teamcity:
     runs-on: ubuntu-latest
     # Either a manual run or the Build-Test-Release workflow has completed successfully and a new release was published to npm
-    #if: ${{ github.event_name == 'workflow_dispatch' || (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.outputs.new_release_published == 'true') }}
-    # ... except we haven't figured out the "and a new release was published to npm" part yet...
-    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.outputs.new_release_published == 'true') }}
     steps:
         - name: Trigger TeamCity Build for alpha.bloomlibrary.org
           uses: fjogeleit/http-request-action@v1