diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index 70201213..5401f7a0 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml @@ -1,15 +1,23 @@ -name: Java CI +name: Java CI (1.20.5) on: push: branches: - - "main" + - 'main' workflow_dispatch: + branches: + - 'main' inputs: - norelease: - description: 'Do not publish' + release_type: + description: 'Release Type' required: true - default: 'false' + type: choice + default: 'release' + options: + - 'release' + - 'beta' + - 'alpha' + - 'none' jobs: build: @@ -17,17 +25,24 @@ jobs: if: | !contains(github.event.head_commit.message, '[ci skip]') steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 with: fetch-depth: 1 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '21' cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 + - name: Build and Publish with Gradle uses: gradle/gradle-build-action@v2 env: @@ -35,14 +50,15 @@ jobs: SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }} with: arguments: build -x test publish --stacktrace --no-daemon + - name: Release to CurseForge uses: gradle/gradle-build-action@v2 - if: | - contains(github.ref, 'main') && !contains(github.event.head_commit.message, '[norelease]') && github.event.inputs.norelease != 'true' + if: ${{ github.event_name == 'workflow_dispatch' && inputs.release_type != 'none' }} env: GIT_COMMIT: ${{ github.event.after }} GIT_PREVIOUS_COMMIT: ${{ github.event.before }} CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }} MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + RELEASE_TYPE: ${{ inputs.release_type }} with: - arguments: build -x test publishUnified --stacktrace --no-daemon \ No newline at end of file + arguments: publishUnified --stacktrace --no-daemon \ No newline at end of file diff --git a/.kubejs/meta.json b/.kubejs/meta.json index 86594f50..9651660f 100644 --- a/.kubejs/meta.json +++ b/.kubejs/meta.json @@ -10,7 +10,7 @@ "downloads": [ { "name": "Download", - "url": "https://maven.latvian.dev/releases/dev/latvian/mods/rhino/{version}/rhino-{version}.jar" + "url": "https://maven.latvian.dev/releases/dev/latvian/mods/rhino-neoforge/{version}/rhino-neoforge-{version}.jar" } ] } \ No newline at end of file diff --git a/lat.ci.json b/lat.ci.json index 86594f50..9651660f 100644 --- a/lat.ci.json +++ b/lat.ci.json @@ -10,7 +10,7 @@ "downloads": [ { "name": "Download", - "url": "https://maven.latvian.dev/releases/dev/latvian/mods/rhino/{version}/rhino-{version}.jar" + "url": "https://maven.latvian.dev/releases/dev/latvian/mods/rhino-neoforge/{version}/rhino-neoforge-{version}.jar" } ] } \ No newline at end of file