Merge pull request #118 from gjsjohnmurray/pre-CI-publish-by-branch5

CI publish - lookup taggedbranch output correctly

Author: gjsjohnmurray

.github/workflows/main.yml

@@ -35,9 +35,7 @@ jobs:
         if: github.event_name == 'release' && runner.os == 'Windows'
         shell: bash
         run: |
-          git branch --list | cat
           git fetch --depth=1 origin +refs/heads/*:refs/heads/*
-          git branch --list -v | cat
           set -x
           TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
           echo ::set-output name=taggedbranch::$TAGGEDBRANCH
@@ -114,7 +112,7 @@ jobs:
           asset_content_type: application/zip
   publish:
     needs: build
-    if: github.event_name == 'release' && needs.find-branch.outputs.taggedbranch == 'master'
+    if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'master'
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/prerelease.yml

@@ -35,9 +35,7 @@ jobs:
         if: github.event_name == 'release' && runner.os == 'Windows'
         shell: bash
         run: |
-          git branch --list | cat
           git fetch --depth=1 origin +refs/heads/*:refs/heads/*
-          git branch --list -v | cat
           set -x
           TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
           echo ::set-output name=taggedbranch::$TAGGEDBRANCH
@@ -116,7 +114,7 @@ jobs:
           asset_content_type: application/zip
   publish:
     needs: build
-    if: github.event_name == 'release' && needs.find-branch.outputs.taggedbranch == 'prerelease'
+    if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'prerelease'
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 3.1.2022012606 (26-Jan-2022 pre-release)
+## 3.1.2022012607 (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.2022012606",
+  "version": "3.1.2022012607",
   "preview": true,
   "publisher": "intersystems-community",
   "description": "Define connections to InterSystems servers. Browse and manage those servers.",