diff --git a/.github/workflows/gradle-publish-1.5.7.yml b/.github/workflows/gradle-publish-1.5.7.yml index 2bac7f00..b31a719c 100644 --- a/.github/workflows/gradle-publish-1.5.7.yml +++ b/.github/workflows/gradle-publish-1.5.7.yml @@ -26,22 +26,18 @@ jobs: id: vars shell: bash run: | - echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + echo "{branch}=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_STATE + echo "{sha_short}=$(git rev-parse --short HEAD)" >> $GITHUB_STATE - name: Build with Gradle run: ./gradlew env: OPTIMIZE_FOR_CI_CD: "1" - BUILD_NUMBER: ${{ steps.calculated_build_number.outputs.build_n }} + BUILD_NUMBER: ${{ github.run_id }} GITHUB_ACTIONS_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" GITHUB_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}" - - name: Upload the final artifact - uses: actions/upload-artifact@v4 - with: - path: plugin/build/libs/SBA-${{ steps.read_property.outputs.value }}-all.jar - uses: ncipollo/release-action@v1 with: - artifacts: "LICENSE,plugin/build/libs*.jar" - tag: ${{ steps.read_property.outputs.value }}.${{ steps.vars.outputs.sha_short }} + artifacts: "LICENSE,plugin/build/libs/*.jar" + tag: ${{ steps.read_property.outputs.value }} allowUpdates: true prerelease: true diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 8c0c4454..85463d1d 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -34,22 +34,15 @@ jobs: run: ./gradlew env: OPTIMIZE_FOR_CI_CD: "1" - BUILD_NUMBER: ${{ steps.calculated_build_number.outputs.build_n }} + BUILD_NUMBER: ${{ github.run_id }} GITHUB_ACTIONS_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" GITHUB_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}" - - name: Upload the final artifact - uses: actions/upload-artifact@v4 + - uses: ncipollo/release-action@v1 with: - path: plugin/build/libs/SBA-${{ steps.read_property.outputs.value }}-all.jar - - uses: "marvinpinto/action-automatic-releases@latest" - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" - prerelease: false - title: "Release Build ${{ steps.read_property.outputs.value }}" - files: | - LICENSE - plugin/build/libs/*.jar + artifacts: "LICENSE,plugin/build/libs/*.jar" + tag: ${{ steps.read_property.outputs.value }} + allowUpdates: true + prerelease: true # - name: Upload Release Asset # id: upload-release-asset diff --git a/build.gradle b/build.gradle index 0f813bcb..b64e5f86 100644 --- a/build.gradle +++ b/build.gradle @@ -97,9 +97,6 @@ subprojects { maven { url = uri('https://repo.dmulloy2.net/nexus/repository/public/') } - maven { - url = uri('https://repo.screamingsandals.org/public') - } maven { url = uri('https://repo.screamingsandals.org/releases') } diff --git a/gradle.properties b/gradle.properties index d2735433..b9fe65b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ KYORI_ADVENTURE_PLATFORM_BUKKIT_VERSION=4.11.0 PAPI_VERSION=2.11.1 SCREAMINGLIB_VERSION=2.0.3-SNAPSHOT SIMPLEINVENTORIES_VERSION=2.0.3-SNAPSHOT -SCREAMING_PLUGIN_BUILDER_VERSION=1.0.76 +SCREAMING_PLUGIN_BUILDER_VERSION=1.0.77 org.gradle.jvmargs='-Dfile.encoding=UTF-8' BUILDCONFIG_VERSION=3.0.2 org.gradle.jvmargs=-Xmx1024M