fix: try versions again

bitfocus · Mar 29, 2022 · e3de952 · e3de952
1 parent a1bdfd3
commit e3de952
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/.github/actions/versions/action.yaml b/.github/actions/versions/action.yaml
@@ -1,6 +1,10 @@
 name: 'Determine API Server versions'
 description: 'Determine API Server versions'
 inputs:
+  long-vesion:
+    description: 'Long version number'
+    required: true
+    default: ''
   beta-branch:
     description: 'Name of branch for beta builds'
     required: true
@@ -31,13 +35,13 @@ runs:
            echo ::set-output name=version::"${VERSION}"
          elif [[ "${{ github.ref }}" == refs/heads/* && "${{ github.ref_name }}" == "${{ inputs.beta-branch }}" ]]
          then
-           VERSION=$(cat BUILD)
+           VERSION="${{ inputs.long-version }}"
            echo "beta build ${VERSION}"
            echo ::set-output name=branch::"beta"
            echo ::set-output name=version::"${VERSION}"
          elif [[ "${{ github.ref }}" == refs/heads/* && "${{ github.ref_name }}" == "${{ inputs.dev-branch }}" ]]
          then
-           VERSION=$(cat BUILD)
+           VERSION="${{ inputs.long-version }}"
            echo "dev build ${VERSION}"
            echo ::set-output name=branch::"experimental"
            echo ::set-output name=version::"${VERSION}"

diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -33,18 +33,21 @@ jobs:
         run: |
           HASH=$(git rev-parse --short HEAD)
           COUNT=$(git rev-list --count HEAD)
+          VERSION=$(node -e "console.log(require('./package.json').version)")
 
           echo ::set-output name=sourcename::"electron-output/companion-satellite-x64.tar.gz"
           echo ::set-output name=targetname::"companion-satellite-x64-${COUNT}-${HASH}.tar.gz"
+          echo ::set-output name=longversion::"${VERSION}"
 
       - name: Versions
         id: versions
         uses: ./.github/actions/versions
         with:
+          long-vesion: ${{ steps.filenames.outputs.longversion }}
           beta-branch: master
 
       - name: Upload app
-        if: ${{ steps.filenames.outputs.sourcename }} && ${{ steps.versions.outputs.version }} && ${{ steps.versions.outputs.branch }}
+        if: ${{ steps.versions.outputs.version }} && ${{ steps.versions.outputs.branch }}
         uses: ./.github/actions/s3-upload
         with:
           source-filename: ${{ steps.filenames.outputs.sourcename }}
@@ -55,7 +58,7 @@ jobs:
           secret-key: ${{ secrets.S3_SECRET }}
 
       - name: Notify API Server'
-        if: ${{ steps.filenames.outputs.targetname }} && ${{ steps.versions.outputs.version }} && ${{ steps.versions.outputs.branch }}
+        if: ${{ steps.versions.outputs.version }} && ${{ steps.versions.outputs.branch }}
         uses: ./.github/actions/webhook
         with:
           product: satellite
@@ -90,14 +93,17 @@ jobs:
         run: |
           HASH=$(git rev-parse --short HEAD)
           COUNT=$(git rev-list --count HEAD)
+          VERSION=$(node -e "console.log(require('./package.json').version)")
 
           echo ::set-output name=sourcename::"electron-output/companion-satellite-x64.exe"
           echo ::set-output name=targetname::"companion-satellite-x64-${COUNT}-${HASH}.exe"
+          echo ::set-output name=longversion::"${VERSION}"
 
       - name: Versions
         id: versions
         uses: ./.github/actions/versions
         with:
+          long-vesion: ${{ steps.filenames.outputs.longversion }}
           beta-branch: master
 
       - name: Upload app
@@ -152,14 +158,17 @@ jobs:
         run: |
           HASH=$(git rev-parse --short HEAD)
           COUNT=$(git rev-list --count HEAD)
+          VERSION=$(node -e "console.log(require('./package.json').version)")
 
           echo ::set-output name=sourcename::"electron-output/companion-satellite-x64.dmg"
           echo ::set-output name=targetname::"companion-satellite-x64-${COUNT}-${HASH}.dmg"
+          echo ::set-output name=longversion::"${VERSION}"
 
       - name: Versions
         id: versions
         uses: ./.github/actions/versions
         with:
+          long-vesion: ${{ steps.filenames.outputs.longversion }}
           beta-branch: master
 
       - name: Upload app