From 8da33e41851d385f9dd1d95e7bc676ea82b31462 Mon Sep 17 00:00:00 2001
From: Julius van Dis <julius.van.dis@flock.community>
Date: Thu, 9 Jan 2025 18:02:41 +0100
Subject: [PATCH] Simplify build

---
 .github/workflows/build.yml | 34 ----------------------------------
 .github/workflows/gcp.yml   | 14 ++++++++++++--
 pom.xml                     |  2 ++
 3 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 9ca33b4b..00000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Java CI
-
-on:
-  push:
-    branches:
-      - "**"
-      - "!master"
-
-jobs:
-  build-kotlin:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: "17"
-          cache: "maven"
-
-      - name: Build with Maven
-        run: ./mvnw -B package --file pom.xml
-
-  build-react:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 16
-          cache: "npm"
-
-      - run: npm ci
-      - run: npm run lint
-      - run: npm run build
diff --git a/.github/workflows/gcp.yml b/.github/workflows/gcp.yml
index e5136e90..42e2e0bc 100644
--- a/.github/workflows/gcp.yml
+++ b/.github/workflows/gcp.yml
@@ -49,8 +49,18 @@ jobs:
           node-version: 16
           cache: "npm"
 
+      - name: Ktlint
+        run: ./mvnw -B ktlint:check
+
+      - run: npm ci
+      - name: Eslint / prettier
+        run: npm run lint
+
+      - name: Full build
+        run: ./mvnw -B package
+
       - name: Build and Deploy
-        run: ./mvnw -B compile -P frontend jib:build -Djib.to.image=eu.gcr.io/flock-community/flock-eco-workday -Djib.to.tags=${{ github.sha }} --file pom.xml
+        run: ./mvnw -B compile jib:build -Pfrontend -Dnpm.ci.skip -Djib.to.image=eu.gcr.io/flock-community/flock-eco-workday -Djib.to.tags=${{ github.sha }} --file pom.xml
 
       - name: Build and Deploy Development version
-        run: ./mvnw -B compile -P develop -P frontend jib:build -Djib.container.environment=SPRING_PROFILES_ACTIVE=develop -Djib.to.image=eu.gcr.io/flock-community/flock-eco-workday-develop -Djib.to.tags=${{ github.sha }} --file pom.xml
+        run: ./mvnw -B compile jib:build -Pdevelop,frontend -Dnpm.ci.skip -Dnpm.skip -Djib.container.environment=SPRING_PROFILES_ACTIVE=develop -Djib.to.image=eu.gcr.io/flock-community/flock-eco-workday-develop -Djib.to.tags=${{ github.sha }} --file pom.xml
diff --git a/pom.xml b/pom.xml
index 86e18f38..a51455d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <kotlin.version>1.9.22</kotlin.version>
         <gpg.skip>true</gpg.skip>
         <wirespec.version>0.8.51</wirespec.version>
+        <npm.ci.skip>false</npm.ci.skip>
     </properties>
 
     <dependencies>
@@ -333,6 +334,7 @@
                                 </goals>
                                 <configuration>
                                     <arguments>ci</arguments>
+                                    <skip>${npm.ci.skip}</skip>
                                 </configuration>
                             </execution>
                             <execution>