ci: Rework CI

null2264 · Nov 6, 2023 · 1847aab · 1847aab
1 parent c1992a7
commit 1847aab
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -0,0 +1,13 @@
+name: "Setup environment"
+description: "Set up Java environment"
+runs:
+  using: "composite"
+  steps:
+    - name: "Validate gradle"
+      uses: gradle/wrapper-validation-action@v1
+    - name: "Setup JDK"
+      uses: actions/setup-java@v3
+      with:
+        distribution: "temurin"
+        java-version: 17
+    - run: chmod +x ./gradlew
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,18 +4,12 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
-    container:
-      image: openjdk:17-jdk
-      options: --user root
-
     steps:
     - uses: actions/checkout@v2.2.0
-    - run: |
-          chmod +x ./gradlew
-          ./gradlew build
+    - uses: ./.github/actions/setup
+    - name: "Build LibreExpFix"
+      run: ./gradlew build
     - uses: actions/upload-artifact@v2
       with:
         name: build-artifacts

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,16 +5,11 @@ on: [workflow_dispatch]
 jobs:
   release:
     runs-on: ubuntu-latest
-
-    container:
-      image: openjdk:17-jdk
-      options: --user root
-
     steps:
     - uses: actions/checkout@v2.2.0
-    - run: |
-        chmod +x ./gradlew
-        ./gradlew build curseforge modrinth --stacktrace
+    - uses: ./.github/actions/setup
+    - name: "Build and Deploy"
+      run: ./gradlew build curseforge modrinth --stacktrace
       env:
         CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
         MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}