Skip to content

Commit

Permalink
Update release configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Oct 31, 2022
1 parent 3f2cd0d commit eb51d7c
Show file tree
Hide file tree
Showing 34 changed files with 98 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- 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 }}
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/early-access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: |
chmod +x mvnw
version=$(./mvnw -ntp help:evaluate -Dexpression=project.version -q -DforceStdout)
echo ::set-output name=VERSION::$(echo "$version")
echo "VERSION=$(echo $version)" >>$GITHUB_OUTPUT
release:
name: release
Expand All @@ -54,9 +54,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRO }}
Expand All @@ -77,6 +79,9 @@ jobs:
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_KEY }}
JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_TOKEN }}
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
run: |
./mvnw -B -ntp -pl :layrry-aggregator -Pjreleaser jreleaser:release
Expand Down
34 changes: 27 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRO }}
Expand All @@ -51,12 +51,22 @@ jobs:
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- uses: actions/cache@v3
- name: Cache Maven
uses: actions/cache@v3
with:
path: ~/.m2
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: 'Test Build Readiness'
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: |
export GPG_TTY=$(tty)
./mvnw -ntp --file pom.xml -Dmaven.site.skip=true -Drelease=true verify -e
- name: 'Set release version'
id: version
run: |
Expand All @@ -70,15 +80,18 @@ jobs:
NEXT_VERSION=$COMPUTED_NEXT_VERSION
fi
echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
./mvnw -B -ntp versions:set versions:commit -DnewVersion=$RELEASE_VERSION
./mvnw -ntp -B versions:set versions:commit -DnewVersion=$RELEASE_VERSION
git config --global user.email "${{ env.USER_EMAIL }}"
git config --global user.name "${{ env.USER_NAME }}"
git commit -a -m "🏁 Releasing version $RELEASE_VERSION"
git push origin HEAD:master
# clean needed to remove previous build
# install needed by tests
# don't @ me <_<
- name: Build
run: |
./mvnw -B -ntp install -DskipTests=true
./mvnw -ntp -B clean install -DskipTests=true
- name: 'Release to Maven Central'
env:
Expand All @@ -87,7 +100,7 @@ jobs:
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: |
export GPG_TTY=$(tty)
./mvnw --no-transfer-progress -B --file pom.xml \
./mvnw -ntp --file pom.xml \
-Drepository.url=https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git \
-Dmaven.site.skip=true -Drelease=true -DskipTests=true deploy -e
Expand All @@ -96,8 +109,15 @@ jobs:
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_KEY }}
JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_TOKEN }}
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
JRELEASER_TWITTER_CONSUMER_KEY: ${{ secrets.JRELEASER_TWITTER_CONSUMER_KEY }}
JRELEASER_TWITTER_CONSUMER_SECRET: ${{ secrets.JRELEASER_TWITTER_CONSUMER_SECRET }}
JRELEASER_TWITTER_ACCESS_TOKEN: ${{ secrets.JRELEASER_TWITTER_ACCESS_TOKEN }}
JRELEASER_TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.JRELEASER_TWITTER_ACCESS_TOKEN_SECRET }}
run: |
./mvnw -B -ntp -pl :layrry-aggregator -Pjreleaser jreleaser:full-release
./mvnw -ntp -B -pl :layrry-aggregator -Pjreleaser jreleaser:full-release
- name: 'JReleaser output'
if: always()
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin-example/greeter-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-platform</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/greeter-date-util-1.0.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/greeter-date-util-2.0.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/greeter-de/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/greeter-en/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/greeter-fr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/greeter-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.greeter</groupId>
<artifactId>layrry-plugin-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.moditect.layrry.example</groupId>
<artifactId>layrry-examples-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>org.moditect.layrry.example.greeter</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>org.moditect.layrry.example</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/vertx-example/layrry-links-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.moditect.layrry.example.links</groupId>
<artifactId>layrry-links-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>layrry-links-core</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-platform</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/vertx-example/layrry-links-greenkeeping/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.moditect.layrry.example.links</groupId>
<artifactId>layrry-links-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>layrry-links-greenkeeping</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/vertx-example/layrry-links-logconfig/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.example.links</groupId>
<artifactId>layrry-links-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>layrry-links-logconfig</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/vertx-example/layrry-links-membership/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.moditect.layrry.example.links</groupId>
<artifactId>layrry-links-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>layrry-links-membership</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/vertx-example/layrry-links-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry.example.links</groupId>
<artifactId>layrry-links-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/vertx-example/layrry-links-tournament/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.moditect.layrry.example.links</groupId>
<artifactId>layrry-links-example</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>layrry-links-tournament</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/vertx-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.moditect.layrry.example</groupId>
<artifactId>layrry-examples-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>org.moditect.layrry.example.links</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>it-app</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-bar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>it-bar</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-foo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>it-foo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-greeter-1.0.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>it-greeter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-greeter-2.0.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>it-greeter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-logconfig/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>it-logconfig</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/it-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.moditect.layrry.it</groupId>
<artifactId>layrry-integrationtest</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>layrry-integrationtest-runner</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>org.moditect.layrry.it</groupId>
Expand Down
2 changes: 1 addition & 1 deletion layrry-config-toml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion layrry-config-yaml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion layrry-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion layrry-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.moditect.layrry</groupId>
<artifactId>layrry-aggregator</artifactId>
<version>1.0.0.Alpha2</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
Loading

0 comments on commit eb51d7c

Please sign in to comment.