diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b106463c..8f0893d72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,27 +18,27 @@ jobs: if: startsWith(github.event.head_commit.message, 'Releasing version') != true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} - - uses: actions/cache@v2 + - name: Cache Gradle + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- + restore-keys: ${{ runner.os }}-gradle- - - uses: actions/cache@v2 + - name: Cache Gradle wrapper + uses: actions/cache@v3 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }} - restore-keys: | - ${{ runner.os }}-gradlew- + restore-keys: ${{ runner.os }}-gradlew- - name: Build run: ./gradlew build -S \ No newline at end of file diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index d4bd53bd4..e9aeff4c1 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -17,7 +17,7 @@ jobs: VERSION: ${{ steps.vars.outputs.VERSION }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: n1hility/cancel-previous-runs@v2 with: @@ -39,27 +39,27 @@ jobs: os: [ ubuntu-latest, macos-latest, windows-latest ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} - - uses: actions/cache@v2 + - name: Cache Gradle + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- + restore-keys: ${{ runner.os }}-gradle- - - uses: actions/cache@v2 + - name: Cache Gradle wrapper + uses: actions/cache@v3 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }} - restore-keys: | - ${{ runner.os }}-gradlew- + restore-keys: ${{ runner.os }}-gradlew- - name: Build run: ./gradlew -Prelease=true build @@ -93,16 +93,10 @@ jobs: fetch-depth: 0 - name: Download build artifacts - uses: actions/download-artifact@v2 - - - name: Setup Java - uses: actions/setup-java@v2 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: ${{ env.JAVA_DISTRO }} + uses: actions/download-artifact@v3 - name: Release - uses: jreleaser/release-action@v1 + uses: jreleaser/release-action@v2 with: version: early-access arguments: full-release -P artifactsDir=artifacts @@ -115,7 +109,7 @@ jobs: - name: JReleaser output if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: jreleaser-release path: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 033db410b..859a0df31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: VERSION: ${{ steps.vars.outputs.VERSION }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: n1hility/cancel-previous-runs@v2 with: @@ -42,27 +42,27 @@ jobs: steps: - name: Check out repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} - - uses: actions/cache@v2 + - name: Cache Gradle + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- + restore-keys: ${{ runner.os }}-gradle- - - uses: actions/cache@v2 + - name: Cache Gradle wrapper + uses: actions/cache@v3 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }} - restore-keys: | - ${{ runner.os }}-gradlew- + restore-keys: ${{ runner.os }}-gradlew- - name: Version run: | @@ -75,7 +75,7 @@ jobs: run: ./gradlew -Prelease=true :ikonli-browser:jlinkZip :ikonli-browser:jpackage - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: artifacts if-no-files-found: ignore @@ -95,32 +95,32 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download build artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} - - uses: actions/cache@v2 + - name: Cache Gradle + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- + restore-keys: ${{ runner.os }}-gradle- - - uses: actions/cache@v2 + - name: Cache Gradle wrapper + uses: actions/cache@v3 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }} - restore-keys: | - ${{ runner.os }}-gradlew- + restore-keys: ${{ runner.os }}-gradlew- - name: Version run: | @@ -133,18 +133,19 @@ jobs: git push origin master - name: Deploy - env: - GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} - GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} run: | - ./gradlew -Prelease=true -Pfull-release=true \ - -PsonatypeUsername=${{ secrets.SONATYPE_USERNAME }} \ - -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} \ - build :ikonli-bom:publishToSonatype publishToSonatype closeAndReleaseSonatypeStagingRepository -S + ./gradlew -Pprofile=release -PreproducibleBuild=true publish -S + + - name: Upload deploy artifacts + uses: actions/upload-artifact@v3 + with: + retention-days: 7 + name: deploy + path: | + build/repos/local/release/ - name: Release - uses: jreleaser/release-action@v1 + uses: jreleaser/release-action@v2 with: arguments: full-release -P artifactsDir=artifacts env: @@ -157,12 +158,15 @@ jobs: JRELEASER_TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }} JRELEASER_TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }} JRELEASER_TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} + JRELEASER_MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }} + JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - name: JReleaser release output if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: jreleaser-release path: | out/jreleaser/trace.log - out/jreleaser/output.properties \ No newline at end of file + out/jreleaser/output.properties diff --git a/build.gradle b/build.gradle index 9e4433646..23970f76b 100644 --- a/build.gradle +++ b/build.gradle @@ -138,4 +138,4 @@ project.rootProject.gradle.addBuildListener(new BuildAdapter() { } } } -}) \ No newline at end of file +}) diff --git a/gradle.properties b/gradle.properties index 5c2985a3b..5cfac4d68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,12 +27,12 @@ jacocoVersion = 0.8.6 zuluVersion = zulu16.30.15-ca-jdk16.0.1 osPluginVersion = 1.7.0 -kordampPluginVersion = 0.46.0 -kordampBuildVersion = 2.5.0 +kordampPluginVersion = 0.46.6 +kordampBuildVersion = 2.8.0 gitPluginVersion = 3.0.0 modularityPluginVersion = 1.8.10 jlinkPluginVersion = 2.24.4 -jreleaserPluginVersion = 1.0.0-M3 +jreleaserPluginVersion = 1.4.0 miglayoutVersion = 11.0 antdesigniconsVersion = 4.0.0 diff --git a/jreleaser.yml b/jreleaser.yml index 188b6224e..ccd93b1e8 100644 --- a/jreleaser.yml +++ b/jreleaser.yml @@ -49,7 +49,6 @@ release: changelog: formatted: ALWAYS preset: conventional-commits - format: '- {{commitShortHash}} {{commitTitle}}' contributors: format: '- {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}}' labelers: @@ -80,12 +79,26 @@ release: - search: 'deps: ' signing: - active: always + active: ALWAYS armored: true announce: twitter: - active: release + active: RELEASE + mastodon: + host: https://mastodon.social + active: RELEASE + +deploy: + maven: + nexus2: + maven-central: + active: RELEASE + url: https://s01.oss.sonatype.org/service/local + closeRepository: true + releaseRepository: true + stagingRepositories: + - build/repos/local/release distributions: ikonli-browser: