Skip to content

Commit ac194ef

Browse files
Update common files (#1208)
Co-authored-by: Sergio del Amo <[email protected]>
1 parent 3ecbac6 commit ac194ef

File tree

9 files changed

+26
-12
lines changed

9 files changed

+26
-12
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/

.clinerules/coding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The root project MUST NOT contain any code: it is a parent project which coordin
4141

4242
You SHOULD prefer modern Java idioms: records, pattern matching, sealed interfaces/classes, `var` for local variables.
4343
You MUST NOT use fully qualified class names unless there is a conflict between 2 class names in different packages.
44-
You MUST annotate the code with nullability annotations (`io.micronaut.core.annotation.Nullable`, `io.micronaut.core.annotation.NonNull`).
44+
You MUST annotate the code with nullability annotations (`org.jspecify.annotations.Nullable`, `org.jspecify.annotations.NonNull`).
4545
You MUST NOT use reflection: Micronaut is a reflection-free framework tailored for integration with GraalVM.
4646
You MUST use `jakarta.inject` for dependency injection, NOT `javax.inject`.
4747

.github/instructions/coding.instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The root project MUST NOT contain any code: it is a parent project which coordin
4141

4242
You SHOULD prefer modern Java idioms: records, pattern matching, sealed interfaces/classes, `var` for local variables.
4343
You MUST NOT use fully qualified class names unless there is a conflict between 2 class names in different packages.
44-
You MUST annotate the code with nullability annotations (`io.micronaut.core.annotation.Nullable`, `io.micronaut.core.annotation.NonNull`).
44+
You MUST annotate the code with nullability annotations (`org.jspecify.annotations.Nullable`, `org.jspecify.annotations.NonNull`).
4545
You MUST NOT use reflection: Micronaut is a reflection-free framework tailored for integration with GraalVM.
4646
You MUST use `jakarta.inject` for dependency injection, NOT `javax.inject`.
4747

.github/workflows/central-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v6
2424
with:
2525
ref: v${{ github.event.inputs.release_version }}
26-
- uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5
26+
- uses: gradle/actions/wrapper-validation@v5
2727
- name: Set up JDK
2828
uses: actions/setup-java@v5
2929
with:

.github/workflows/graalvm-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
with:
5555
java: ${{ matrix.java }}
5656
distribution: ${{ matrix.distribution }}
57+
nativeTestTask: ${{ matrix.native_test_task }}
5758
- name: Build Steps
5859
uses: micronaut-projects/github-actions/graalvm/build@master
5960
id: build

.github/workflows/graalvm-latest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
distribution: 'graalvm'
5858
gradle-java: '21'
5959
java: ${{ matrix.java }}
60+
nativeTestTask: ${{ matrix.native_test_task }}
6061
- name: Build Steps
6162
uses: micronaut-projects/github-actions/graalvm/build@master
6263
id: build

.github/workflows/gradle.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
github-token: ${{ secrets.GITHUB_TOKEN }}
6060

6161
- name: "🔧 Setup Gradle"
62-
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5
62+
uses: gradle/actions/setup-gradle@v5
6363

6464
- name: "❓ Optional setup step"
6565
run: |
@@ -83,15 +83,15 @@ jobs:
8383
8484
- name: "📊 Publish Test Report"
8585
if: always()
86-
uses: mikepenz/action-junit-report@v5
86+
uses: mikepenz/action-junit-report@v6
8787
with:
8888
check_name: Java CI / Test Report (${{ matrix.java }})
8989
report_paths: '**/build/test-results/test/TEST-*.xml'
9090
check_retries: 'true'
9191

9292
- name: "📜 Upload binary compatibility check results"
9393
if: matrix.java == '21'
94-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
94+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9595
with:
9696
name: binary-compatibility-reports
9797
path: "**/build/reports/binary-compatibility-*.html"
@@ -119,3 +119,7 @@ jobs:
119119
GH_TOKEN: ${{ secrets.GH_TOKEN }}
120120
BRANCH: gh-pages
121121
FOLDER: build/docs
122+
123+
- name: "❓ Optional cleanup step"
124+
run: |
125+
[ -f ./cleanup.sh ] && ./cleanup.sh || [ ! -f ./cleanup.sh ]

.github/workflows/release.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v6
2323
with:
2424
token: ${{ secrets.GH_TOKEN }}
25-
- uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5
25+
- uses: gradle/actions/wrapper-validation@v5
2626
- name: Set up JDK
2727
uses: actions/setup-java@v5
2828
with:
@@ -73,13 +73,13 @@ jobs:
7373
# Store the hash in a file, which is uploaded as a workflow artifact.
7474
sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256
7575
- name: Upload build artifacts
76-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
76+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7777
with:
7878
name: gradle-build-outputs
7979
path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/*
8080
retention-days: 5
8181
- name: Upload artifacts-sha256
82-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
82+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8383
with:
8484
name: artifacts-sha256
8585
path: artifacts-sha256
@@ -94,11 +94,14 @@ jobs:
9494
GH_USERNAME: ${{ secrets.GH_USERNAME }}
9595
- name: Export Gradle Properties
9696
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
97100
- name: Publish to Github Pages
98101
if: success()
99102
uses: micronaut-projects/github-pages-deploy-action@master
100103
env:
101-
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') }}
102105
GH_TOKEN: ${{ secrets.GH_TOKEN }}
103106
BRANCH: gh-pages
104107
FOLDER: build/docs
@@ -122,7 +125,7 @@ jobs:
122125
artifacts-sha256: ${{ steps.set-hash.outputs.artifacts-sha256 }}
123126
steps:
124127
- name: Download artifacts-sha256
125-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
128+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
126129
with:
127130
name: artifacts-sha256
128131
# The SLSA provenance generator expects the hash digest of artifacts to be passed as a job
@@ -155,7 +158,7 @@ jobs:
155158
- name: Checkout repository
156159
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
157160
- name: Download artifacts
158-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
161+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
159162
with:
160163
name: gradle-build-outputs
161164
path: build/repo

.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

0 commit comments

Comments
 (0)