From ea4e848e57c6cd48c9a8b7e9629b1aadd727adb8 Mon Sep 17 00:00:00 2001
From: Patrick Toal <ptoal@takeflight.ca>
Date: Mon, 24 Jun 2024 07:25:59 -0400
Subject: [PATCH] fix: make build process work

---
 .gitea/workflows/build.yaml |  7 +++++--
 .releaserc.json             |  2 +-
 generate-version.js         | 13 ++-----------
 package.json                |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index c155d5f..e71b137 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -8,6 +8,8 @@ on:
 
 jobs:
   build:
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout
@@ -33,9 +35,10 @@ jobs:
       - name: Build and Release
         id: build
         run: |
-          npm run semantic-version
+          npx semantic-release
         env:
-          GT_TOKEN: ${{ secrets.GT_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.GT_TOKEN }}
+          GITEA_URL: ${{ vars.GT_URL }}
       - name: Trigger Ansible Deploy Playbook
         uses: https://github.com/distributhor/workflow-webhook@v3
         with:
diff --git a/.releaserc.json b/.releaserc.json
index 25918dd..168747d 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -12,7 +12,7 @@
     [
       "@semantic-release/exec",
       {
-        "prepareCmd": "quasar build -m pwa",
+        "prepareCmd": "npm run generate-version '${nextRelease.version}' && quasar build -m pwa",
         "publishCmd": "tar -czvf release-${nextRelease.version}.tar.gz dist/pwa && echo '::set-output name=VERSION::${nextRelease.version}'"
       }
     ],
diff --git a/generate-version.js b/generate-version.js
index fc47481..f48eab9 100644
--- a/generate-version.js
+++ b/generate-version.js
@@ -1,19 +1,10 @@
-const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
 try {
-  // Run semantic-release to get the next version number
-  const dryRunOutput = execSync('npx semantic-release --dry-run').toString();
+  const version = process.argv[2];
 
-  // Extract the version number from the semantic-release output
-  const versionMatch = dryRunOutput.match(
-    /The next release version is ([\S]+)/
-  );
-  if (!versionMatch) {
-    throw new Error('Version number not found in semantic-release output');
-  }
-  const version = versionMatch[1];
+  if (!version) throw Error('Must pass version on command line');
 
   // Create version content
   const versionContent = `export const APP_VERSION = '${version}';\n`;
diff --git a/package.json b/package.json
index cae27b9..febafb9 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
     "lint": "eslint --ext .js,.ts,.vue ./",
     "format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore",
     "test": "echo \"No test specified\" && exit 0",
-    "dev": "npm run generate-version && quasar dev",
-    "build": "npm run generate-version && quasar build"
+    "dev": "npm run generate-version && quasar dev -m pwa",
+    "build": "npm run generate-version && quasar build -m pwa"
   },
   "dependencies": {
     "@quasar/extras": "^1.16.11",