👷 Fix build jobs

BetaHuhn · Apr 12, 2021 · 8aaff0b · 8aaff0b
1 parent 6360f99
commit 8aaff0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 31 deletions.
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
@@ -4,12 +4,12 @@ on:
     branches-ignore:
       - master
     paths:
-      - 'client/*'
+      - 'build/ui/*'
   pull_request:
     branches-ignore:
       - master
     paths:
-      - 'client/*'
+      - 'build/ui/*'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -18,20 +18,16 @@ jobs:
       - uses: actions/checkout@v2
       - uses: c-hive/gha-npm-cache@v1
       - name: Install dependencies
-        working-directory: ./client
         run: npm ci
       - name: Build Vue.js App
-        working-directory: ./client
-        run: npm run build
+        run: npm run client:build
   lint:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v2
       - uses: c-hive/gha-npm-cache@v1
       - name: Install dependencies
-        working-directory: ./client
         run: npm ci
       - name: Run eslint
-        working-directory: ./client
-        run: npm run lint
+        run: npm run client:lint
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,30 +4,8 @@ on:
     branches:
       - master
 jobs:
-  client-build:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: c-hive/gha-npm-cache@v1
-      - name: Install dependencies
-        working-directory: ./client
-        run: npm ci
-      - name: Build Vue.js App
-        working-directory: ./client
-        run: npm run build
-  server-build:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: c-hive/gha-npm-cache@v1
-      - name: Install dependencies
-        run: npm ci
-      - name: Build Server
-        run: npm run server:build
   release:
-    needs: [client-build, server-build]
+    name: Build and release
     runs-on: ubuntu-18.04
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
@@ -41,6 +19,8 @@ jobs:
         uses: c-hive/gha-npm-cache@v1
       - name: Install dependencies
         run: npm ci
+      - name: Build frontend and backend
+        run: npm run build
       - name: Release
         run: npx semantic-release
         env: