Skip to content

Commit 7584d17

Browse files
Update common files
1 parent e4fe411 commit 7584d17

File tree

10 files changed

+77
-31
lines changed

10 files changed

+77
-31
lines changed

.clineignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ build/
66
*/build/
77
!build/docs/
88
!build/docs/**
9+
!build/generated/
10+
!build/generated/**
911

1012
# === Dependency/Cache directories ===
1113
.gradle/

.github/workflows/central-sync.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ jobs:
1414
central-sync:
1515
runs-on: ubuntu-latest
1616
steps:
17+
- name: Remove system JDKs
18+
run: |
19+
sudo rm -rf /usr/lib/jvm/*
20+
unset JAVA_HOME
21+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
1722
- name: Checkout repository
1823
uses: actions/checkout@v5
1924
with:
2025
ref: v${{ github.event.inputs.release_version }}
21-
- uses: gradle/actions/wrapper-validation@v4
26+
- uses: gradle/actions/wrapper-validation@v5
2227
- name: Set up JDK
2328
uses: actions/setup-java@v5
2429
with:

.github/workflows/graalvm-dev.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
- name: Build Matrix
2323
uses: micronaut-projects/github-actions/graalvm/build-matrix@master
2424
id: build-matrix
25-
with:
26-
java-version: '21'
2725
build:
2826
needs: build_matrix
2927
if: github.repository != 'micronaut-projects/micronaut-project-template'
@@ -44,14 +42,19 @@ jobs:
4442
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
4543
DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
4644
steps:
45+
- name: Remove system JDKs
46+
run: |
47+
sudo rm -rf /usr/lib/jvm/*
48+
unset JAVA_HOME
49+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
4750
- uses: actions/checkout@v5
4851
- name: Pre-Build Steps
4952
uses: micronaut-projects/github-actions/graalvm/pre-build@master
5053
id: pre-build
5154
with:
5255
java: ${{ matrix.java }}
53-
gradle-java: '21'
5456
distribution: ${{ matrix.distribution }}
57+
nativeTestTask: ${{ matrix.native_test_task }}
5558
- name: Build Steps
5659
uses: micronaut-projects/github-actions/graalvm/build@master
5760
id: build

.github/workflows/graalvm-latest.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88
push:
99
branches:
1010
- master
11-
- '[1-9]+.[0-9]+.x'
11+
- '[0-9]+.[0-9]+.x'
1212
pull_request:
1313
branches:
1414
- master
15-
- '[1-9]+.[0-9]+.x'
15+
- '[0-9]+.[0-9]+.x'
1616
jobs:
1717
build_matrix:
1818
if: github.repository != 'micronaut-projects/micronaut-project-template'
@@ -37,13 +37,18 @@ jobs:
3737
strategy:
3838
max-parallel: 6
3939
matrix:
40-
java: [ '21' ]
40+
java: ['21']
4141
native_test_task: ${{ fromJson(needs.build_matrix.outputs.matrix).native_test_task }}
4242
env:
4343
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4444
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
4545
DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
4646
steps:
47+
- name: Remove system JDKs
48+
run: |
49+
sudo rm -rf /usr/lib/jvm/*
50+
unset JAVA_HOME
51+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
4752
- uses: actions/checkout@v5
4853
- name: Pre-Build Steps
4954
uses: micronaut-projects/github-actions/graalvm/pre-build@master
@@ -52,6 +57,7 @@ jobs:
5257
distribution: 'graalvm'
5358
gradle-java: '21'
5459
java: ${{ matrix.java }}
60+
nativeTestTask: ${{ matrix.native_test_task }}
5561
- name: Build Steps
5662
uses: micronaut-projects/github-actions/graalvm/build@master
5763
id: build

.github/workflows/gradle.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ on:
88
push:
99
branches:
1010
- master
11-
- '[1-9]+.[0-9]+.x'
11+
- '[0-9]+.[0-9]+.x'
1212
pull_request:
1313
branches:
1414
- master
15-
- '[1-9]+.[0-9]+.x'
15+
- '[0-9]+.[0-9]+.x'
1616
jobs:
1717
build:
1818
if: github.repository != 'micronaut-projects/micronaut-project-template'
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
java: ['21']
22+
java: ['21', '25']
2323
env:
2424
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2525
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
@@ -34,6 +34,11 @@ jobs:
3434
OSS_INDEX_PASSWORD: ${{ secrets.OSS_INDEX_PASSWORD }}
3535
steps:
3636
# https://github.com/actions/virtual-environments/issues/709
37+
- name: Remove system JDKs
38+
run: |
39+
sudo rm -rf /usr/lib/jvm/*
40+
unset JAVA_HOME
41+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
3742
- name: "🗑 Free disk space"
3843
run: |
3944
sudo rm -rf "/usr/local/share/boost"
@@ -42,33 +47,34 @@ jobs:
4247
df -h
4348
4449
- name: "📥 Checkout repository"
45-
uses: actions/checkout@v4
50+
uses: actions/checkout@v5
4651
with:
4752
fetch-depth: 0
4853

4954
- name: "🔧 Setup GraalVM CE"
50-
uses: graalvm/setup-graalvm@v1.3.6
55+
uses: graalvm/setup-graalvm@v1.4.2
5156
with:
5257
distribution: 'graalvm'
5358
java-version: ${{ matrix.java }}
5459
github-token: ${{ secrets.GITHUB_TOKEN }}
5560

5661
- name: "🔧 Setup Gradle"
57-
uses: gradle/actions/setup-gradle@v4
62+
uses: gradle/actions/setup-gradle@v5
5863

5964
- name: "❓ Optional setup step"
6065
run: |
6166
[ -f ./setup.sh ] && ./setup.sh || [ ! -f ./setup.sh ]
6267
6368
- name: "🚔 Sonatype Scan"
69+
if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '21'
6470
id: sonatypescan
6571
run: |
6672
./gradlew ossIndexAudit --no-parallel --info
6773
6874
- name: "🛠 Build with Gradle"
6975
id: gradle
7076
run: |
71-
./gradlew check --no-daemon --continue
77+
./gradlew check jacocoReport --no-daemon --continue
7278
7379
- name: "🔎 Run static analysis"
7480
if: env.SONAR_TOKEN != '' && matrix.java == '21'
@@ -77,15 +83,15 @@ jobs:
7783
7884
- name: "📊 Publish Test Report"
7985
if: always()
80-
uses: mikepenz/action-junit-report@v5
86+
uses: mikepenz/action-junit-report@v6
8187
with:
8288
check_name: Java CI / Test Report (${{ matrix.java }})
8389
report_paths: '**/build/test-results/test/TEST-*.xml'
8490
check_retries: 'true'
8591

8692
- name: "📜 Upload binary compatibility check results"
8793
if: matrix.java == '21'
88-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
94+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8995
with:
9096
name: binary-compatibility-reports
9197
path: "**/build/reports/binary-compatibility-*.html"
@@ -113,3 +119,7 @@ jobs:
113119
GH_TOKEN: ${{ secrets.GH_TOKEN }}
114120
BRANCH: gh-pages
115121
FOLDER: build/docs
122+
123+
- name: "❓ Optional cleanup step"
124+
run: |
125+
[ -f ./cleanup.sh ] && ./cleanup.sh || [ ! -f ./cleanup.sh ]

.github/workflows/publish-snapshot.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,25 @@ jobs:
1010
if: github.repository != 'micronaut-projects/micronaut-project-template'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- name: Remove system JDKs
14+
run: |
15+
sudo rm -rf /usr/lib/jvm/*
16+
unset JAVA_HOME
17+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
18+
- uses: actions/checkout@v5
1419
- uses: actions/cache@v4
1520
with:
1621
path: ~/.gradle/caches
1722
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
1823
restore-keys: |
1924
${{ runner.os }}-gradle-
2025
- name: Set up JDK
21-
uses: actions/setup-java@v4
26+
uses: actions/setup-java@v5
2227
with:
2328
distribution: 'temurin'
24-
java-version: '21'
29+
java-version: |
30+
21
31+
25
2532
- name: Publish to Sonatype Snapshots
2633
if: success()
2734
env:

.github/workflows/release.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,23 @@ jobs:
1313
artifacts-sha256: ${{ steps.hash.outputs.artifacts-sha256 }} # Computed hashes for build artifacts.
1414
runs-on: ubuntu-latest
1515
steps:
16+
- name: Remove system JDKs
17+
run: |
18+
sudo rm -rf /usr/lib/jvm/*
19+
unset JAVA_HOME
20+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
1621
- name: Checkout repository
17-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
1823
with:
1924
token: ${{ secrets.GH_TOKEN }}
20-
- uses: gradle/actions/wrapper-validation@v4
25+
- uses: gradle/actions/wrapper-validation@v5
2126
- name: Set up JDK
22-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2328
with:
2429
distribution: 'temurin'
25-
java-version: '21'
30+
java-version: |
31+
21
32+
25
2633
- name: Set the current release version
2734
id: release_version
2835
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -66,13 +73,13 @@ jobs:
6673
# Store the hash in a file, which is uploaded as a workflow artifact.
6774
sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256
6875
- name: Upload build artifacts
69-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
76+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7077
with:
7178
name: gradle-build-outputs
7279
path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/*
7380
retention-days: 5
7481
- name: Upload artifacts-sha256
75-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
82+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7683
with:
7784
name: artifacts-sha256
7885
path: artifacts-sha256
@@ -87,11 +94,14 @@ jobs:
8794
GH_USERNAME: ${{ secrets.GH_USERNAME }}
8895
- name: Export Gradle Properties
8996
uses: micronaut-projects/github-actions/export-gradle-properties@master
97+
- name: LATEST_TAG
98+
run: |
99+
echo "LATEST_TAG=$(curl -s -L -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: 2022-11-28' https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name')" >> $GITHUB_ENV
90100
- name: Publish to Github Pages
91101
if: success()
92102
uses: micronaut-projects/github-pages-deploy-action@master
93103
env:
94-
BETA: ${{ !(github.event.release.target_commitish == github.event.repository.default_branch) || contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
104+
BETA: ${{ !(github.event.release.tag_name == env.LATEST_TAG) || github.event.release.draft || github.event.release.prerelease || contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
95105
GH_TOKEN: ${{ secrets.GH_TOKEN }}
96106
BRANCH: gh-pages
97107
FOLDER: build/docs
@@ -115,7 +125,7 @@ jobs:
115125
artifacts-sha256: ${{ steps.set-hash.outputs.artifacts-sha256 }}
116126
steps:
117127
- name: Download artifacts-sha256
118-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
128+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
119129
with:
120130
name: artifacts-sha256
121131
# The SLSA provenance generator expects the hash digest of artifacts to be passed as a job
@@ -146,9 +156,9 @@ jobs:
146156
if: startsWith(github.ref, 'refs/tags/')
147157
steps:
148158
- name: Checkout repository
149-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
159+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
150160
- name: Download artifacts
151-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
161+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
152162
with:
153163
name: gradle-build-outputs
154164
path: build/repo
@@ -160,6 +170,6 @@ jobs:
160170
- name: Upload assets
161171
# Upload the artifacts to the existing release. Note that the SLSA provenance will
162172
# attest to each artifact file and not the aggregated ZIP file.
163-
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
173+
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
164174
with:
165175
files: artifacts.zip

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ src/main/docs/resources/img/micronaut-logo-white.svg
3434

3535
# Ignore files generated by test-resources
3636
**/.micronaut/test-resources/
37+
38+
# Ignore gradle.properties generated by micronaut-build
39+
/buildSrc/gradle.properties

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)