From a3f0f4812841d6e5e4f473e6c6ff4ae12f0469b6 Mon Sep 17 00:00:00 2001 From: joffutt4 Date: Fri, 16 Apr 2021 21:22:35 -0400 Subject: [PATCH 1/4] Create build.yml First pass at a pseudo-auto build --- .github/workflows/build.yml | 61 +++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..904cc8d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,61 @@ +# This is a basic workflow that is manually triggered + +name: Build App + +# Manually triggered +on: + workflow_dispatch: + inputs: + version: + description: 'The version of the application being built' + required: true + +jobs: + + # Builds all major OS versions of FA + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + + steps: + - name: Check out the code + uses: actions/checkout@v2.3.4 + + + - name: Setup Node.js environment + uses: actions/setup-node@v2.1.5 + + - name: npm install and build + run: | + npm install + npm run build + + - name: Upload Linux Artifact + if: ${{ matrix.os }} == ubuntu-latest + uses: actions/upload-artifact@v2.2.3 + with: + # Artifact name + name: Linux_FA ${{ github.event.inputs.version }} + # A file, directory or wildcard pattern that describes what to upload + path: dist/electron/Packaged/*.AppImage + + - name: Upload MacOS Artifact + if: ${{ matrix.os }} == macOS-latest + uses: actions/upload-artifact@v2.2.3 + with: + # Artifact name + name: Linux_FA ${{ github.event.inputs.version }} + # A file, directory or wildcard pattern that describes what to upload + path: dist/electron/Packaged/*.dmg + + - name: Upload Windows Artifact + if: ${{ matrix.os }} == windows-latest + uses: actions/upload-artifact@v2.2.3 + with: + # Artifact name + name: Linux_FA ${{ github.event.inputs.version }} + # A file, directory or wildcard pattern that describes what to upload + path: dist/electron/Packaged/*.exe + From 4f1ba2775d68ab1d016027056c422129fd2dc50e Mon Sep 17 00:00:00 2001 From: joffutt4 Date: Sat, 17 Apr 2021 01:39:17 +0000 Subject: [PATCH 2/4] Fixing build workflow --- .github/workflows/build.yml | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 904cc8d..b23b24f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: npm run build - name: Upload Linux Artifact - if: ${{ matrix.os }} == ubuntu-latest + if: ${{ matrix.os == ubuntu-latest }} uses: actions/upload-artifact@v2.2.3 with: # Artifact name @@ -42,20 +42,20 @@ jobs: path: dist/electron/Packaged/*.AppImage - name: Upload MacOS Artifact - if: ${{ matrix.os }} == macOS-latest + if: ${{ matrix.os == macOS-latest }} uses: actions/upload-artifact@v2.2.3 with: # Artifact name - name: Linux_FA ${{ github.event.inputs.version }} + name: Mac_FA ${{ github.event.inputs.version }} # A file, directory or wildcard pattern that describes what to upload path: dist/electron/Packaged/*.dmg - name: Upload Windows Artifact - if: ${{ matrix.os }} == windows-latest + if: ${{ matrix.os == windows-latest }} uses: actions/upload-artifact@v2.2.3 with: # Artifact name - name: Linux_FA ${{ github.event.inputs.version }} + name: Windows_FA ${{ github.event.inputs.version }} # A file, directory or wildcard pattern that describes what to upload path: dist/electron/Packaged/*.exe diff --git a/package.json b/package.json index f43cac8..595f88d 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lint": "eslint --ext .js,.ts,.vue ./", "test": "echo \"No test specified\" && exit 0", "dev": "quasar dev -m electron", - "build": "quasar build -m electron" + "build": "quasar build -m electron -T all" }, "dependencies": { "@quasar/extras": "^1.0.0", From 054229c1358e8795579e983d8c46925876c9db51 Mon Sep 17 00:00:00 2001 From: joffutt4 Date: Sat, 17 Apr 2021 01:40:43 +0000 Subject: [PATCH 3/4] Forgot quotes --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b23b24f..7a198d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: npm run build - name: Upload Linux Artifact - if: ${{ matrix.os == ubuntu-latest }} + if: ${{ matrix.os == 'ubuntu-latest' }} uses: actions/upload-artifact@v2.2.3 with: # Artifact name @@ -42,7 +42,7 @@ jobs: path: dist/electron/Packaged/*.AppImage - name: Upload MacOS Artifact - if: ${{ matrix.os == macOS-latest }} + if: ${{ matrix.os == 'macOS-latest' }} uses: actions/upload-artifact@v2.2.3 with: # Artifact name @@ -51,7 +51,7 @@ jobs: path: dist/electron/Packaged/*.dmg - name: Upload Windows Artifact - if: ${{ matrix.os == windows-latest }} + if: ${{ matrix.os == 'windows-latest' }} uses: actions/upload-artifact@v2.2.3 with: # Artifact name From 4423c3c80c7005f52bea2ce94105f2584d8748bd Mon Sep 17 00:00:00 2001 From: joffutt4 Date: Sat, 17 Apr 2021 02:55:00 +0000 Subject: [PATCH 4/4] Reverting accidental package.json change --- .github/workflows/build.yml | 9 +++------ package.json | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a198d5..a3e455b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,8 +38,7 @@ jobs: with: # Artifact name name: Linux_FA ${{ github.event.inputs.version }} - # A file, directory or wildcard pattern that describes what to upload - path: dist/electron/Packaged/*.AppImage + path: dist/electron/Packaged/ - name: Upload MacOS Artifact if: ${{ matrix.os == 'macOS-latest' }} @@ -47,8 +46,7 @@ jobs: with: # Artifact name name: Mac_FA ${{ github.event.inputs.version }} - # A file, directory or wildcard pattern that describes what to upload - path: dist/electron/Packaged/*.dmg + path: dist/electron/Packaged/ - name: Upload Windows Artifact if: ${{ matrix.os == 'windows-latest' }} @@ -56,6 +54,5 @@ jobs: with: # Artifact name name: Windows_FA ${{ github.event.inputs.version }} - # A file, directory or wildcard pattern that describes what to upload - path: dist/electron/Packaged/*.exe + path: dist/electron/Packaged/ diff --git a/package.json b/package.json index 595f88d..f43cac8 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lint": "eslint --ext .js,.ts,.vue ./", "test": "echo \"No test specified\" && exit 0", "dev": "quasar dev -m electron", - "build": "quasar build -m electron -T all" + "build": "quasar build -m electron" }, "dependencies": { "@quasar/extras": "^1.0.0",