Merge remote-tracking branch 'electroid/master'

Comp-MC · Dec 22, 2023 · 172c185 · 172c185
2 parents 156cfa0 + e4afd29
commit 172c185
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/ci.yml b/.github/workflows/build.yml → .github/workflows/ci.yml
@@ -1,26 +1,24 @@
-name: Build
+name: CI
 
 on:
   push:
     paths:
       - patches/**.patch
-      - scripts/**.sh
       - pom.xml
       - settings.xml
   pull_request:
     paths:
       - patches/**.patch
-      - scripts/**.sh
   workflow_dispatch:
 
 jobs:
   build:
-    name: Build (Java ${{ matrix.java }})
+    permissions:
+      contents: read
     strategy:
       matrix:
         java:
           - "8"
-          - "17"
     runs-on: ubuntu-latest
     steps:
       - id: checkout
@@ -45,14 +43,21 @@ jobs:
         name: Upload SportPaper
         uses: actions/upload-artifact@v3
         with:
-          name: SportPaper-Java-${{ matrix.java }}.jar
+          name: SportPaper.jar
           path: SportPaper-Server/target/sportpaper-*.jar
           if-no-files-found: error
+  deploy:
+    permissions:
+      contents: read
+      packages: write
+    need: build
+    if: |
+      github.repository_owner == 'Electroid' &&
+      github.event_name == 'push' &&
+      github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
       - id: deploy
-        if: |
-          github.repository_owner == 'Electroid' &&
-          github.ref == 'refs/heads/main' &&
-          matrix.java == '8'
         name: Deploy SportPaper
         run: mvn --batch-mode deploy
         env:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# SportPaper [![Status](https://github.com/Electroid/SportPaper/actions/workflows/build.yml/badge.svg)](https://github.com/Electroid/SportPaper/actions)
+# SportPaper
 
 A performance-tuned Minecraft 1.8 server, forked from Spigot and Paper.
 

diff --git a/sportpaper b/sportpaper
@@ -39,7 +39,7 @@ case "$1" in
         cd "$basedir"
         scripts/upstream.sh
         scripts/apply.sh "$basedir"
-        mvn --batch-mode clean install
+        mvn clean install
         # buildpaperclipjar
     ;;
     "rb" | "rbp" | "rebuild")
@@ -60,7 +60,7 @@ case "$1" in
     "j" | "jar")
     (
         set -e
-        mvn --batch-mode clean install
+        mvn clean install
         # buildpaperclipjar
     )
     ;;