Merge pull request #114 from gjsjohnmurray/pre-CI-publish-by-branch

Revise publish CIs so only the correct one runs

Author: gjsjohnmurray

.github/workflows/main.yml

@@ -14,8 +14,6 @@ on:
     branches:
       - master
   release:
-    branches:
-      - master
     types:
       - released
 jobs:
@@ -102,10 +100,24 @@ jobs:
           asset_path: ${{ needs.build.outputs.name }}.vsix
           asset_name: ${{ needs.build.outputs.name }}.vsix
           asset_content_type: application/zip
-  publish:
+  get_tagged_branch:
     if: github.event_name == 'release'
     runs-on: windows-latest
     needs: build
+    outputs:
+      taggedbranch: ${{ steps.find-branch.outputs.taggedbranch }}
+    steps:
+      - name: Find which branch the release tag points at
+        id: find-branch
+        shell: bash
+        run: |
+          set -x
+          TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
+          echo ::set-output name=taggedbranch::$TAGGEDBRANCH
+  publish:
+    needs: get_tagged_branch
+    if: github.event_name == 'release' && needs.find-branch.outputs.taggedbranch == 'master'
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -119,6 +131,9 @@ jobs:
         id: set-version
         shell: bash
         run: |
+          # REMOVE BELOW AFTER TESTING
+          exit 1
+          # REMOVE ABOVE AFTER TESTING
           VERSION=${{ needs.build.outputs.version }}
           NEXT_VERSION=`echo $VERSION | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
           tmp=$(mktemp)

.github/workflows/prerelease.yml

@@ -14,8 +14,6 @@ on:
     branches:
       - prerelease
   release:
-    branches:
-      - prerelease
     types:
       - released
 jobs:
@@ -104,10 +102,24 @@ jobs:
           asset_path: ${{ needs.build.outputs.name }}.vsix
           asset_name: ${{ needs.build.outputs.name }}.vsix
           asset_content_type: application/zip
-  publish:
+  get_tagged_branch:
     if: github.event_name == 'release'
     runs-on: windows-latest
     needs: build
+    outputs:
+      taggedbranch: ${{ steps.find-branch.outputs.taggedbranch }}
+    steps:
+      - name: Find which branch the release tag points at
+        id: find-branch
+        shell: bash
+        run: |
+          set -x
+          TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
+          echo ::set-output name=taggedbranch::$TAGGEDBRANCH
+  publish:
+    needs: get_tagged_branch
+    if: github.event_name == 'release' && needs.find-branch.outputs.taggedbranch == 'prerelease'
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
         with:

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 3.1.2022012602 (26-Jan-2022 pre-release)
+## 3.1.2022012603 (26-Jan-2022 pre-release)
 * Update README.
 * Automate pre-release publication to Marketplace.
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "servermanager",
   "displayName": "InterSystems Server Manager",
-  "version": "3.1.2022012603-SNAPSHOT",
+  "version": "3.1.2022012603",
   "preview": true,
   "publisher": "intersystems-community",
   "description": "Define connections to InterSystems servers. Browse and manage those servers.",