chore: inject build version number

bitfocus · Feb 2, 2025 · 1c2032c · 1c2032c
1 parent 9e0961a
commit 1c2032c
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 58 deletions.
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -57,17 +57,6 @@ jobs:
         with:
           node-version-file: '.node-version'
 
-      - name: Run build
-        run: |
-          corepack enable
-
-          # try and avoid timeout errors
-          yarn config set httpTimeout 100000
-
-          yarn
-          yarn --cwd webui install
-          yarn dist
-
       - name: Determine files to upload
         id: filenames
         shell: bash
@@ -80,6 +69,19 @@ jobs:
           echo "targetname=companion-satellite-x64-${COUNT}-${HASH}.tar.gz" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
 
+      - name: Run build
+        run: |
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn
+          yarn --cwd webui install
+          yarn dist
+        env:
+          BUILD_VERSION: ${{ steps.filenames.outputs.longversion }}
+
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:
@@ -122,17 +124,6 @@ jobs:
         with:
           node-version-file: '.node-version'
 
-      - name: Run build
-        run: |
-          corepack enable
-
-          # try and avoid timeout errors
-          yarn config set httpTimeout 100000
-
-          yarn
-          yarn --cwd webui install
-          yarn dist linux-arm64
-
       - name: Determine files to upload
         id: filenames
         shell: bash
@@ -145,6 +136,19 @@ jobs:
           echo "targetname=companion-satellite-arm64-${COUNT}-${HASH}.tar.gz" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
 
+      - name: Run build
+        run: |
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn
+          yarn --cwd webui install
+          yarn dist linux-arm64
+        env:
+          BUILD_VERSION: ${{ steps.filenames.outputs.longversion }}
+
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:
@@ -182,6 +186,18 @@ jobs:
         with:
           node-version-file: '.node-version'
 
+      - name: Determine files to upload
+        id: filenames
+        shell: bash
+        run: |
+          HASH=$(git rev-parse --short HEAD)
+          COUNT=$(git rev-list --count HEAD)
+          VERSION=$(node -e "console.log(require('./package.json').version)")
+
+          echo "sourcename=electron-output/companion-satellite-x64.exe" >> $GITHUB_OUTPUT
+          echo "targetname=companion-satellite-x64-${COUNT}-${HASH}.exe" >> $GITHUB_OUTPUT
+          echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
+
       - name: Run build
         shell: bash
         run: |
@@ -208,6 +224,7 @@ jobs:
           yarn dist win32-x64
         env:
           CI: 1
+          BUILD_VERSION: ${{ steps.filenames.outputs.longversion }}
 
       - name: build & package (signed)
         if: ${{ runner.environment == 'self-hosted' }}
@@ -226,18 +243,6 @@ jobs:
           CSC_LINK: c:\\actions-runner-bitfocusas\\codesign.cer
           BF_CODECERT_KEY: ${{ secrets.BF_CODECERT_KEY }}
 
-      - name: Determine files to upload
-        id: filenames
-        shell: bash
-        run: |
-          HASH=$(git rev-parse --short HEAD)
-          COUNT=$(git rev-list --count HEAD)
-          VERSION=$(node -e "console.log(require('./package.json').version)")
-
-          echo "sourcename=electron-output/companion-satellite-x64.exe" >> $GITHUB_OUTPUT
-          echo "targetname=companion-satellite-x64-${COUNT}-${HASH}.exe" >> $GITHUB_OUTPUT
-          echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
-
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:
@@ -275,6 +280,18 @@ jobs:
         with:
           node-version-file: '.node-version'
 
+      - name: Determine files to upload
+        id: filenames
+        shell: bash
+        run: |
+          HASH=$(git rev-parse --short HEAD)
+          COUNT=$(git rev-list --count HEAD)
+          VERSION=$(node -e "console.log(require('./package.json').version)")
+
+          echo "sourcename=electron-output/companion-satellite-x64.dmg" >> $GITHUB_OUTPUT
+          echo "targetname=companion-satellite-x64-${COUNT}-${HASH}.dmg" >> $GITHUB_OUTPUT
+          echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
+
       - name: Run build
         shell: bash
         run: |
@@ -300,18 +317,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLEID }}
           APPLE_TEAM_ID: ${{ secrets.APPLETEAMID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
-
-      - name: Determine files to upload
-        id: filenames
-        shell: bash
-        run: |
-          HASH=$(git rev-parse --short HEAD)
-          COUNT=$(git rev-list --count HEAD)
-          VERSION=$(node -e "console.log(require('./package.json').version)")
-
-          echo "sourcename=electron-output/companion-satellite-x64.dmg" >> $GITHUB_OUTPUT
-          echo "targetname=companion-satellite-x64-${COUNT}-${HASH}.dmg" >> $GITHUB_OUTPUT
-          echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
+          BUILD_VERSION: ${{ steps.filenames.outputs.longversion }}
 
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
@@ -350,6 +356,18 @@ jobs:
         with:
           node-version-file: '.node-version'
 
+      - name: Determine files to upload
+        id: filenames
+        shell: bash
+        run: |
+          HASH=$(git rev-parse --short HEAD)
+          COUNT=$(git rev-list --count HEAD)
+          VERSION=$(node -e "console.log(require('./package.json').version)")
+
+          echo "sourcename=electron-output/companion-satellite-arm64.dmg" >> $GITHUB_OUTPUT
+          echo "targetname=companion-satellite-arm64-${COUNT}-${HASH}.dmg" >> $GITHUB_OUTPUT
+          echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
+
       - name: Run build
         shell: bash
         run: |
@@ -375,18 +393,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLEID }}
           APPLE_TEAM_ID: ${{ secrets.APPLETEAMID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
-
-      - name: Determine files to upload
-        id: filenames
-        shell: bash
-        run: |
-          HASH=$(git rev-parse --short HEAD)
-          COUNT=$(git rev-list --count HEAD)
-          VERSION=$(node -e "console.log(require('./package.json').version)")
-
-          echo "sourcename=electron-output/companion-satellite-arm64.dmg" >> $GITHUB_OUTPUT
-          echo "targetname=companion-satellite-arm64-${COUNT}-${HASH}.dmg" >> $GITHUB_OUTPUT
-          echo "longversion=${VERSION}+${COUNT}-${HASH}" >> $GITHUB_OUTPUT
+          BUILD_VERSION: ${{ steps.filenames.outputs.longversion }}
 
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main

diff --git a/tools/build_electron.mts b/tools/build_electron.mts
@@ -138,6 +138,8 @@ const satellitePkgJson = JSON.parse(satellitePkgJsonStr.toString())
 satellitePkgJson.updateChannel = process.env.EB_UPDATE_CHANNEL
 console.log('Injecting update channel: ' + satellitePkgJson.updateChannel)
 
+if (process.env.BUILD_VERSION) satellitePkgJson.version = process.env.BUILD_VERSION
+
 await fs.writeFile(satellitePkgJsonPath, JSON.stringify(satellitePkgJson))
 
 try {