Merge build workflow into deploy

vouncherstudios · Jul 16, 2024 · 7bbe0fb · 7bbe0fb
1 parent aeac865
commit 7bbe0fb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -1,10 +1,8 @@
-name: Java CI with Maven
+name: Java CI with Maven and Deploy to Repository
 
 on:
   push:
     branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
 
 jobs:
   build:
@@ -25,8 +23,17 @@ jobs:
           distribution: 'temurin'
           architecture: x64
 
-      - name: Build
+      - uses: s4u/maven-settings-action@v3.0.0
+        with:
+          servers: |
+            [{
+                "id": "vouncherstudios-repository-snapshots",
+                "username": "${{ secrets.REPOSITORY_USERNAME }}",
+                "password": "${{ secrets.REPOSITORY_PASSWORD }}"
+            }]
+
+      - name: Build and Deploy
         run: |
           git config --global user.email "you@example.com"
           git config --global user.name "Your Name"
-          ./acf build
+          ./acf deploy
diff --git a/.github/workflows/maven-publish.yml → .github/workflows/pr_maven.yml b/.github/workflows/maven-publish.yml → .github/workflows/pr_maven.yml
@@ -1,7 +1,7 @@
-name: Maven Package
+name: Java CI with Maven
 
 on:
-  push:
+  pull_request:
     branches: [ "master" ]
 
 jobs:
@@ -23,17 +23,8 @@ jobs:
           distribution: 'temurin'
           architecture: x64
 
-      - uses: s4u/maven-settings-action@v3.0.0
-        with:
-          servers: |
-            [{
-                "id": "vouncherstudios-repository-snapshots",
-                "username": "${{ secrets.REPOSITORY_USERNAME }}",
-                "password": "${{ secrets.REPOSITORY_PASSWORD }}"
-            }]
-
-      - name: Deploy
+      - name: Build
         run: |
           git config --global user.email "you@example.com"
           git config --global user.name "Your Name"
-          ./acf deploy
+          ./acf build