Skip to content

Commit

Permalink
[acme] Update common files for branch master (micronaut-projects#122)
Browse files Browse the repository at this point in the history
  • Loading branch information
micronaut-build authored Feb 18, 2021
1 parent 912bd06 commit 0aae6b1
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 61 deletions.
31 changes: 0 additions & 31 deletions .github/workflows/bintray-publish.yml

This file was deleted.

7 changes: 1 addition & 6 deletions .github/workflows/central-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ jobs:
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
GPG_FILE: ${{ secrets.GPG_FILE }}
PUBLISH_IN_2_STEPS: ${{ secrets.PUBLISH_IN_2_STEPS }}
run: |
echo $GPG_FILE | base64 -d > secring.gpg
if [ -z ${PUBLISH_IN_2_STEPS+x} ]; then
./gradlew publish closeAndReleaseRepository
else
./gradlew publish && ./gradlew closeAndReleaseRepository
fi
./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
4 changes: 2 additions & 2 deletions .github/workflows/dependency-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/cache@v2.1.4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Check Dependencies
run: ./gradlew useLatestVersions
- name: Create Pull Request
uses: peter-evans/[email protected].0
uses: peter-evans/[email protected].2
with:
token: ${{ secrets.GH_TOKEN }}
committer: micronaut-build <${{ secrets.MICRONAUT_BUILD_EMAIL }}>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/graalvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
graalvm: ['20.3.0.java8', '20.3.0.java11']
steps:
- uses: actions/checkout@v2
- uses: actions/[email protected].2
- uses: actions/[email protected].4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
java: ['8', '11', '15']
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/cache@v2.1.4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand All @@ -39,12 +39,12 @@ jobs:
run: ./gradlew dependencyUpdates check --parallel --continue
env:
TESTCONTAINERS_RYUK_DISABLED: true
- name: Publish to JFrog OSS
- name: Publish to Sonatype Snapshots
if: success() && github.event_name == 'push' && matrix.java == '8'
env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
run: ./gradlew publish docs --no-daemon
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
run: ./gradlew publishToSonatype docs --no-daemon
- name: Determine docs target repository
uses: haya14busa/action-cond@v1
id: docs_target
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,8 @@ jobs:
MICRONAUT_BUILD_EMAIL: ${{ secrets.MICRONAUT_BUILD_EMAIL }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Upload to Bintray
env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
BINTRAY_PUBLISH: ${{ secrets.BINTRAY_PUBLISH }}
run: ./gradlew bintrayUpload docs
- name: Generate docs
run: ./gradlew docs
- name: Export Gradle Properties
uses: micronaut-projects/github-actions/export-gradle-properties@master
- name: Publish to Github Pages
Expand Down
10 changes: 1 addition & 9 deletions MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ source of truth for certain files. It is used as a template to create new repos,
template repo will get propagated automatically. The files propagated are:

* Workflow files (`.github/workflows/*`). They are copied using rsync"
* `bintray-publish.yml`.
* `central-sync.yml`.
* `dependency-update.yml`.
* `graalvm.yml`.
Expand Down Expand Up @@ -175,23 +174,16 @@ will kick off, performing the following steps:

* Pre-release: sets the `projectVersion` property in `gradle.properties` to the release version, and commit and pushes
the result.
* Uploads and publishes to Bintray.
* Generates documentation guide and publishes it to the `gh-pages` branch.
* Sends a pull request to Core to update the BOM.
* Post-release:
* Determines the next patch version, and sets it as a `SNAPSHOT` version.
* Closes the milestone that matches the release version, and creates a new one for the next patch.

Note that there are repos (like Core, that has a lot of modules) where uploading and publishing in the same Gradle execution
fails. If you want to upload, but not publish, define a repo secret `BINTRAY_PUBLISH` and set its value to `false`. Then,
once the release workflow has finished, you need to manually trigger the Bintray Publish workflow through the GitHub UI.

If everything goes well, you now need to manually trigger the Maven Central publishing workflow via the GitHub UI.

If there is an issue with the release, it's important not to trigger the Maven Central publishing workflow because once
we publish a version to Maven Central we cannot change or remove it anymore. On the other hand, if something failed during
the Bintray upload, docs publication,... we can manually log in into Bintray UI, delete the artifacts, and then restart
the workflow.
we publish a version to Maven Central we cannot change or remove it anymore.

There are some properties in `gradle.properties` that affect the release process:

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 0aae6b1

Please sign in to comment.