Skip to content

Commit 67c24f2

Browse files
Update common files (#177)
1 parent 56df2aa commit 67c24f2

File tree

9 files changed

+34
-17
lines changed

9 files changed

+34
-17
lines changed

.github/renovate.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": [
3+
"config:base"
4+
],
5+
"addLabels": ["dependency-upgrade"],
6+
"schedule": [
7+
"every weekend"
8+
],
9+
"prHourlyLimit": 1,
10+
"prConcurrentLimit": 20,
11+
"timezone": "Europe/Prague"
12+
}

.github/workflows/central-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
ref: v${{ github.event.inputs.release_version }}
2121
- uses: gradle/wrapper-validation-action@v1
2222
- name: Set up JDK
23-
uses: actions/setup-java@v2
23+
uses: actions/setup-java@v3
2424
with:
2525
distribution: 'adopt'
2626
java-version: '8'

.github/workflows/graalvm.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sudo apt-get clean
3030
df -h
3131
- uses: actions/checkout@v3
32-
- uses: actions/cache@v2.1.7
32+
- uses: actions/cache@v3
3333
with:
3434
path: ~/.gradle/caches
3535
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -54,9 +54,11 @@ jobs:
5454
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5555
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
5656
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
57+
PREDICTIVE_TEST_SELECTION: "${{ github.event_name == 'pull_request' && 'true' || 'false' }}"
5758
- name: Publish Test Report
5859
if: always()
59-
uses: mikepenz/action-junit-report@v2.9.1
60+
uses: mikepenz/action-junit-report@v3.0.2
6061
with:
6162
check_name: GraalVM CE CI / Test Report (Java ${{ matrix.java }})
6263
report_paths: '**/build/test-results/test/TEST-*.xml'
64+
check_retries: 'true'

.github/workflows/gradle.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
sudo apt-get clean
3030
df -h
3131
- uses: actions/checkout@v3
32-
- uses: actions/cache@v2.1.7
32+
- uses: actions/cache@v3
3333
with:
3434
path: ~/.gradle/caches
3535
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
3636
restore-keys: |
3737
${{ runner.os }}-gradle-
3838
- name: Set up JDK
39-
uses: actions/setup-java@v2
39+
uses: actions/setup-java@v3
4040
with:
4141
distribution: 'adopt'
4242
java-version: ${{ matrix.java }}
@@ -57,12 +57,14 @@ jobs:
5757
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5858
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
5959
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
60+
PREDICTIVE_TEST_SELECTION: "${{ github.event_name == 'pull_request' && 'true' || 'false' }}"
6061
- name: Publish Test Report
6162
if: always()
62-
uses: mikepenz/action-junit-report@v2.9.1
63+
uses: mikepenz/action-junit-report@v3.0.2
6364
with:
6465
check_name: Java CI / Test Report (${{ matrix.java }})
6566
report_paths: '**/build/test-results/test/TEST-*.xml'
67+
check_retries: 'true'
6668
- name: Publish to Sonatype Snapshots
6769
if: success() && github.event_name == 'push' && matrix.java == '8'
6870
env:

.github/workflows/publish-snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14-
- uses: actions/cache@v2.1.7
14+
- uses: actions/cache@v3
1515
with:
1616
path: ~/.gradle/caches
1717
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
1818
restore-keys: |
1919
${{ runner.os }}-gradle-
2020
- name: Set up JDK
21-
uses: actions/setup-java@v2
21+
uses: actions/setup-java@v3
2222
with:
2323
distribution: 'adopt'
2424
java-version: '8'

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
token: ${{ secrets.GH_TOKEN }}
1818
- uses: gradle/wrapper-validation-action@v1
1919
- name: Set up JDK
20-
uses: actions/setup-java@v2
20+
uses: actions/setup-java@v3
2121
with:
2222
distribution: 'adopt'
2323
java-version: '8'
@@ -60,6 +60,7 @@ jobs:
6060
BRANCH: gh-pages
6161
FOLDER: build/docs
6262
VERSION: ${{ steps.release_version.outputs.release_version }}
63+
TARGET_REPOSITORY: ${{ github.repository == 'micronaut-projects/micronaut-core' && env.docsRepository || github.repository }}
6364
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6465
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
6566
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}

.github/workflows/sonarqube.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
- uses: actions/checkout@v3
2929
with:
3030
fetch-depth: 0
31-
- uses: actions/cache@v2.1.7
31+
- uses: actions/cache@v3
3232
with:
3333
path: ~/.gradle/caches
3434
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
3535
restore-keys: |
3636
${{ runner.os }}-gradle-
3737
- name: Set up JDK
38-
uses: actions/setup-java@v2
38+
uses: actions/setup-java@v3
3939
with:
4040
distribution: 'adopt'
4141
java-version: 11

MAINTAINING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ follow a slightly different strategy.
8888

8989
All Micronaut repos have 2 dependency upgrade checking mechanism:
9090

91-
1. Dependabot: it has the advantage that it performs dependency upgrades not only on build dependencies, but also on
91+
1. Renovate: it has the advantage that it performs dependency upgrades not only on build dependencies, but also on
9292
GitHub Actions workflows. On the other hand, its biggest downside is that it's unable to find newer versions for
9393
those defined in `gradle.properties`. It will also send different PRs for the same version upgrade if the artifact ID
9494
is different. For example, if you have `com.example:client:1.0` and `com.example:server:1.0`, and a new 1.1 version
@@ -99,9 +99,9 @@ All Micronaut repos have 2 dependency upgrade checking mechanism:
9999
during weekdays.
100100

101101
The consequence of having both approaches in place is that we get multiple dependency upgrade PRs: one created by
102-
`micronaut-build` via our automation, and one or many (one per dependency) created by Dependabot. When merging those, it
102+
`micronaut-build` via our automation, and one or many (one per dependency) created by Renovate. When merging those, it
103103
is better to prefer the `micronaut-build` ones, if possible, for 2 reasons: a) they attempt to upgrade multiple dependencies
104-
in a single PR, which creates less noise in the Git history; b) Once you merge that, Dependabot will react and automatically
104+
in a single PR, which creates less noise in the Git history; b) Once you merge that, Renovate will react and automatically
105105
close its own PRs if the dependecy is up-to-date.
106106

107107
When an upgrade to a new version arrives, we need to be careful when merging, so that we don't introduce an
@@ -111,7 +111,7 @@ information.
111111

112112
Note that if a new version arrives and we are not ready yet to do the upgrade, you need to
113113
[pin the old version](https://github.com/micronaut-projects/micronaut-build/#configuration-options), because otherwise,
114-
Dependabot and our workflow will keep sending PRs. You should also create an issue to upgrade so that it's not forgotten.
114+
Renovate and our workflow will keep sending PRs. You should also create an issue to upgrade so that it's not forgotten.
115115

116116
#### Files sync
117117

@@ -126,7 +126,7 @@ template repo will get propagated automatically. The files propagated are:
126126
* `gradle.yml`.
127127
* `release.yml`.
128128
* `release-notes.yml`.
129-
* Dependabot configuration (`.github/dependabot.yml`).
129+
* Renovate configuration (`.github/renovate.json`).
130130
* Gradle wrapper.
131131
* `.gitignore`.
132132
* `ISSUE_TEMPLATE.md`, `LICENSE`, `MAINTAINING.md`, `config/HEADER` and `config/spotless.license.java`.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)