From e6720842b60492abe482188e8bc7d2bdb1b2126e Mon Sep 17 00:00:00 2001
From: FalsePattern <me@falsepattern.com>
Date: Mon, 15 Jul 2024 12:05:36 +0200
Subject: [PATCH] update CI scripts

---
 .github/workflows/build-and-test.yml | 17 +++++++++
 .github/workflows/build-nightly.yml  | 35 -------------------
 .github/workflows/build-pr.yml       | 29 ----------------
 .github/workflows/release-tags.yml   | 52 +++++++---------------------
 4 files changed, 30 insertions(+), 103 deletions(-)
 create mode 100644 .github/workflows/build-and-test.yml
 delete mode 100644 .github/workflows/build-nightly.yml
 delete mode 100644 .github/workflows/build-pr.yml

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..b4e100c
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,17 @@
+name: Build and test
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build-and-test:
+    uses: FalsePattern/fpgradle-workflows/.github/workflows/build-and-test.yml@master
+    with:
+      timeout: 90
+      workspace: setupCIWorkspace
+      client-only: false
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
deleted file mode 100644
index 12cb547..0000000
--- a/.github/workflows/build-nightly.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Build Nightly
-
-on:
-  push:
-    branches: [ master, main ]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with: 
-        fetch-depth: 0
-    
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: gradle
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Release Nightly
-      uses: actions/upload-artifact@v4
-      with:
-        name: nightly
-        path: build/libs/*.jar
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
deleted file mode 100644
index a4e8c25..0000000
--- a/.github/workflows/build-pr.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Build PR
-
-on:
-  pull_request:
-    branches: [ master, main ]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with: 
-        fetch-depth: 0
-    
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: gradle
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-
-    - name: Build the mod
-      run: ./gradlew build
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
index 8596692..8275da2 100644
--- a/.github/workflows/release-tags.yml
+++ b/.github/workflows/release-tags.yml
@@ -1,47 +1,21 @@
-name: Release tagged build
+name: Release Tags
 
 on:
   push:
     tags:
       - '*'
 
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'adopt'
-          cache: gradle
+permissions:
+  contents: write
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build and publish to Maven, Modrinth, and CurseForge
-        run: ./gradlew build publish
-        env:
-          MAVEN_DEPLOY_USER: ${{ secrets.MAVEN_DEPLOY_USER }}
-          MAVEN_DEPLOY_PASSWORD: ${{ secrets.MAVEN_DEPLOY_PASSWORD }}
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-          CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+jobs:
+  release-tags:
+    uses: FalsePattern/fpgradle-workflows/.github/workflows/release-tags.yml@master
+    with:
+      workspace: "setupCIWorkspace"
+    secrets:
+      MAVEN_DEPLOY_USER: ${{ secrets.MAVEN_DEPLOY_USER }}
+      MAVEN_DEPLOY_PASSWORD: ${{ secrets.MAVEN_DEPLOY_PASSWORD }}
+      MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+      CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
 
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar