Simplify build

flock-community · Jan 9, 2025 · 8da33e4 · 8da33e4
1 parent d7a0358
commit 8da33e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git 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
@@ -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>