From 2a3afd7a562578e51548d63527124677eb00b234 Mon Sep 17 00:00:00 2001
From: Andrew Polk <andrew_polk@sil.org>
Date: Tue, 12 Nov 2024 15:15:02 -0700
Subject: [PATCH] chore: more GHA tweaks

---
 .github/workflows/release.yml                 |  7 +--
 .github/workflows/trigger-teamcity-builds.yml | 52 +++++++++++++------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa53d615..85b8de34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,6 +40,7 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npx semantic-release
 
-      - 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"
+        # 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"
diff --git a/.github/workflows/trigger-teamcity-builds.yml b/.github/workflows/trigger-teamcity-builds.yml
index 408527ef..63d8fb8e 100644
--- a/.github/workflows/trigger-teamcity-builds.yml
+++ b/.github/workflows/trigger-teamcity-builds.yml
@@ -11,21 +11,39 @@ 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') }}
+    #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' }}
     steps:
-      - name: Trigger TeamCity Build for Bloom Reader Alpha
-        uses: fjogeleit/http-request-action@v1
-        with:
-          url: '${{ secrets.TEAMCITY_URL }}/app/rest/buildQueue'
-          method: 'POST'
-          contentType: 'application/json'
-          customHeaders: '{"Authorization": "Bearer ${{ secrets.TEAMCITY_TOKEN_RUN_BUILD }}"}'
-          data: '{"buildType": {"id": "Bloom_BloomReader_BloomReaderMasterAlphaContinuousPublish"}}'
-      - name: Trigger TeamCity Build for Bloom Desktop Alpha
-        uses: fjogeleit/http-request-action@v1
-        with:
-          url: '${{ secrets.TEAMCITY_URL }}/app/rest/buildQueue'
-          method: 'POST'
-          contentType: 'application/json'
-          customHeaders: '{"Authorization": "Bearer ${{ secrets.TEAMCITY_TOKEN_RUN_BUILD }}"}'
-          data: '{"buildType": {"id": "bt222"}}'
+        - name: Trigger TeamCity Build for alpha.bloomlibrary.org
+          uses: fjogeleit/http-request-action@v1
+          with:
+            url: '${{ secrets.TEAMCITY_URL }}/app/rest/buildQueue'
+            method: 'POST'
+            contentType: 'application/json'
+            customHeaders: '{"Authorization": "Bearer ${{ secrets.TEAMCITY_TOKEN_RUN_BUILD }}"}'
+            data: '{"buildType": {"id": "Bloom_BloomLibraryOrg_BloomLibraryAlphaAlphaBloomlibraryOrgContinuous"}}'
+        - name: Trigger TeamCity Build for Bloom Reader Alpha
+          uses: fjogeleit/http-request-action@v1
+          with:
+            url: '${{ secrets.TEAMCITY_URL }}/app/rest/buildQueue'
+            method: 'POST'
+            contentType: 'application/json'
+            customHeaders: '{"Authorization": "Bearer ${{ secrets.TEAMCITY_TOKEN_RUN_BUILD }}"}'
+            data: '{"buildType": {"id": "Bloom_BloomReader_BloomReaderMasterAlphaContinuousPublish"}}'
+        - name: Trigger TeamCity Build for Bloom Desktop Alpha
+          uses: fjogeleit/http-request-action@v1
+          with:
+            url: '${{ secrets.TEAMCITY_URL }}/app/rest/buildQueue'
+            method: 'POST'
+            contentType: 'application/json'
+            customHeaders: '{"Authorization": "Bearer ${{ secrets.TEAMCITY_TOKEN_RUN_BUILD }}"}'
+            data: '{"buildType": {"id": "bt222"}}'
+        - name: Trigger TeamCity Build for dev-alpha.bloomlibrary.org
+          uses: fjogeleit/http-request-action@v1
+          with:
+            url: '${{ secrets.TEAMCITY_URL }}/app/rest/buildQueue'
+            method: 'POST'
+            contentType: 'application/json'
+            customHeaders: '{"Authorization": "Bearer ${{ secrets.TEAMCITY_TOKEN_RUN_BUILD }}"}'
+            data: '{"buildType": {"id": "Bloom_BloomLibraryOrg_BloomLibrary2masterDevAlphaBloomlibraryOrgContinuous"}}'