diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index ba4580c..479321e 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -1,4 +1,4 @@ -name: Publish Release +name: Publish Release to Central on: push: @@ -7,32 +7,19 @@ on: jobs: publish: + container: gradle:jdk25 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 25 - uses: actions/setup-java@v4 - with: - java-version: 25 - distribution: 'temurin' - # GPG setup for signing - gpg-private-key: ${{ secrets.SIGNING_KEY }} - gpg-passphrase: ${{ secrets.SIGNING_PASSWORD }} + - name: Checkout + uses: actions/checkout@v4 - name: Make Gradle executable run: chmod +x ./gradlew - - name: Check JAVA_HOME - run: echo $JAVA_HOME - - name: Build, Test, Publish - run: ./gradlew test publish -Djava.awt.headless=true + run: ./gradlew test -Djava.awt.headless=true env: - # OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - # OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - # GITHUB_ACTOR: ${{ secrets.ACTOR }} - # GITHUB_TOKEN: ${{ secrets.TOKEN }} - GITEA_TOKEN: ${{ secrets.TOKEN }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 54bf208..ceb225a 100644 --- a/build.gradle +++ b/build.gradle @@ -210,31 +210,12 @@ def project = project // prevent 'cannot resolve' warnings publishing { repositories { -// maven { -// name = 'Central' -// url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2' -// credentials { -// username = project.findProperty('ossrh.username') ?: System.getenv('OSSRH_USERNAME') -// password = project.findProperty('ossrh.password') ?: System.getenv('OSSRH_PASSWORD') -// } -// } -// maven { -// name = 'GitHubPackages' -// url = 'https://maven.pkg.github.com/SparkleJ-Framework/sparkle-core' -// credentials { -// username = project.findProperty('gpr.user') ?: System.getenv('GITHUB_ACTOR') -// password = project.findProperty('gpr.token') ?: System.getenv('GITHUB_TOKEN') -// } -// } maven { - name = 'GiteaPackages' - url = 'https://gitea.darktale.keenetic.link/api/packages/michael/maven' - credentials(HttpHeaderCredentials) { - name 'Authorization' - value "token ${project.findProperty('giteaAccessToken') ?: System.getenv('GITEA_TOKEN')}" - } - authentication { - register('header', HttpHeaderAuthentication) + name = 'Central' + url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2' + credentials { + username = project.findProperty('ossrh.username') ?: System.getenv('OSSRH_USERNAME') + password = project.findProperty('ossrh.password') ?: System.getenv('OSSRH_PASSWORD') } } } @@ -244,7 +225,7 @@ publishing { pom { name = 'Sparkle Core Module' description = project.description - url = 'https://sparkle.fokinatorr.net' + url = 'https://sparkle.fokinatorr.net/core' licenses { license { name = 'MIT License'