Merge pull request #610 from mountaindude/599

Another attempt at appending Git SHA to version number in Insider builds
ptarmiganlabs · Jan 6, 2025 · e9f7e51 · e9f7e51
2 parents 283c708 + 7356294
commit e9f7e51
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.github/workflows/insiders-build.yaml b/.github/workflows/insiders-build.yaml
@@ -12,6 +12,10 @@ jobs:
                 include:
                     - os: win-code-sign
                       build: |
+                          # Inject git SHA into package.json
+                          $GIT_SHA = (git rev-parse --short HEAD)
+                          (Get-Content package.json) -replace '"version": "(.*?)"', '"version": "`$1-$GIT_SHA"' | Set-Content package.json
+
                           ./node_modules/.bin/esbuild src/ctrl-q.js --bundle --outfile=build.cjs --format=cjs --platform=node --target=node23 --inject:./src/lib/util/import-meta-url.js --define:import.meta.url=import_meta_url
                           node --experimental-sea-config sea-config.json
                           node -e "require('fs').copyFileSync(process.execPath, 'ctrl-q.exe')"
@@ -63,7 +67,10 @@ jobs:
                       artifact_insider: ctrl-q--win-x64--${{ github.sha }}.zip
                     - os: mac-build1
                       build: |
-                          # -------------------
+                          # Inject git SHA into package.json
+                          GIT_SHA=$(git rev-parse --short HEAD)
+                          sed -i '' "s/\"version\": \".*\"/\"version\": \"4.4.0-$GIT_SHA\"/" package.json
+
                           ./node_modules/.bin/esbuild src/ctrl-q.js --bundle --outfile=build.cjs --format=cjs --platform=node --target=node23 --inject:./src/lib/util/import-meta-url.js --define:import.meta.url=import_meta_url
                           node --experimental-sea-config sea-config.json
                           cp $(command -v node) ${DIST_FILE_NAME}
@@ -125,6 +132,10 @@ jobs:
 
                     - os: ubuntu-latest
                       build: |
+                          # Inject git SHA into package.json
+                          GIT_SHA=$(git rev-parse --short HEAD)
+                          sed -i "s/\"version\": \".*\"/\"version\": \"4.4.0-$GIT_SHA\"/" package.json
+
                           ./node_modules/.bin/esbuild src/ctrl-q.js --bundle --outfile=build.cjs --format=cjs --platform=node --target=node23 --inject:./src/lib/util/import-meta-url.js --define:import.meta.url=import_meta_url
                           node --experimental-sea-config sea-config.json
                           cp $(command -v node) ${DIST_FILE_NAME}
@@ -156,11 +167,6 @@ jobs:
                   pwd
                   npm ci --include=prod
 
-            - name: Inject git SHA into package.json
-              run: |
-                  GIT_SHA=$(git rev-parse --short HEAD)
-                  jq --arg sha "$GIT_SHA" '.version += "-" + $sha' package.json > tmp.$$.json && mv tmp.$$.json package.json
-
             - name: Run Snyk to check for vulnerabilities
               if: |
                   github.repository_owner == 'ptarmiganlabs' &&