Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/central-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@ jobs:
central-sync:
runs-on: ubuntu-latest
steps:
- name: Remove system JDKs
run: |
sudo rm -rf /usr/lib/jvm/*
unset JAVA_HOME
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
- name: Checkout repository
uses: actions/checkout@v5
with:
ref: v${{ github.event.inputs.release_version }}
- uses: gradle/actions/wrapper-validation@v4
- uses: gradle/actions/wrapper-validation@v5
- name: Set up JDK
uses: actions/setup-java@v5
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/graalvm-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
- name: Build Matrix
uses: micronaut-projects/github-actions/graalvm/build-matrix@master
id: build-matrix
with:
java-version: '21'
build:
needs: build_matrix
if: github.repository != 'micronaut-projects/micronaut-project-template'
Expand All @@ -44,13 +42,17 @@ jobs:
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
steps:
- name: Remove system JDKs
run: |
sudo rm -rf /usr/lib/jvm/*
unset JAVA_HOME
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
- uses: actions/checkout@v5
- name: Pre-Build Steps
uses: micronaut-projects/github-actions/graalvm/pre-build@master
id: pre-build
with:
java: ${{ matrix.java }}
gradle-java: '21'
distribution: ${{ matrix.distribution }}
- name: Build Steps
uses: micronaut-projects/github-actions/graalvm/build@master
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/graalvm-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
push:
branches:
- master
- '[1-9]+.[0-9]+.x'
- '[0-9]+.[0-9]+.x'
pull_request:
branches:
- master
- '[1-9]+.[0-9]+.x'
- '[0-9]+.[0-9]+.x'
jobs:
build_matrix:
if: github.repository != 'micronaut-projects/micronaut-project-template'
Expand All @@ -37,13 +37,18 @@ jobs:
strategy:
max-parallel: 6
matrix:
java: [ '21' ]
java: ['21']
native_test_task: ${{ fromJson(needs.build_matrix.outputs.matrix).native_test_task }}
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
steps:
- name: Remove system JDKs
run: |
sudo rm -rf /usr/lib/jvm/*
unset JAVA_HOME
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
- uses: actions/checkout@v5
- name: Pre-Build Steps
uses: micronaut-projects/github-actions/graalvm/pre-build@master
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ on:
push:
branches:
- master
- '[1-9]+.[0-9]+.x'
- '[0-9]+.[0-9]+.x'
pull_request:
branches:
- master
- '[1-9]+.[0-9]+.x'
- '[0-9]+.[0-9]+.x'
jobs:
build:
if: github.repository != 'micronaut-projects/micronaut-project-template'
runs-on: ubuntu-latest
strategy:
matrix:
java: ['21']
java: ['21', '25']
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
Expand All @@ -34,6 +34,11 @@ jobs:
OSS_INDEX_PASSWORD: ${{ secrets.OSS_INDEX_PASSWORD }}
steps:
# https://github.com/actions/virtual-environments/issues/709
- name: Remove system JDKs
run: |
sudo rm -rf /usr/lib/jvm/*
unset JAVA_HOME
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
- name: "🗑 Free disk space"
run: |
sudo rm -rf "/usr/local/share/boost"
Expand All @@ -42,33 +47,34 @@ jobs:
df -h

- name: "📥 Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

- name: "🔧 Setup GraalVM CE"
uses: graalvm/setup-graalvm@v1.3.6
uses: graalvm/setup-graalvm@v1.4.2
with:
distribution: 'graalvm'
java-version: ${{ matrix.java }}
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: "🔧 Setup Gradle"
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5

- name: "❓ Optional setup step"
run: |
[ -f ./setup.sh ] && ./setup.sh || [ ! -f ./setup.sh ]

- name: "🚔 Sonatype Scan"
if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '21'
id: sonatypescan
run: |
./gradlew ossIndexAudit --no-parallel --info

- name: "🛠 Build with Gradle"
id: gradle
run: |
./gradlew check --no-daemon --continue
./gradlew check jacocoReport --no-daemon --continue

- name: "🔎 Run static analysis"
if: env.SONAR_TOKEN != '' && matrix.java == '21'
Expand All @@ -85,7 +91,7 @@ jobs:

- name: "📜 Upload binary compatibility check results"
if: matrix.java == '21'
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: binary-compatibility-reports
path: "**/build/reports/binary-compatibility-*.html"
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,25 @@ jobs:
if: github.repository != 'micronaut-projects/micronaut-project-template'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Remove system JDKs
run: |
sudo rm -rf /usr/lib/jvm/*
unset JAVA_HOME
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
- uses: actions/checkout@v5
- uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Set up JDK
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
java-version: |
21
25
- name: Publish to Sonatype Snapshots
if: success()
env:
Expand Down
27 changes: 17 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,23 @@ jobs:
artifacts-sha256: ${{ steps.hash.outputs.artifacts-sha256 }} # Computed hashes for build artifacts.
runs-on: ubuntu-latest
steps:
- name: Remove system JDKs
run: |
sudo rm -rf /usr/lib/jvm/*
unset JAVA_HOME
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
token: ${{ secrets.GH_TOKEN }}
- uses: gradle/actions/wrapper-validation@v4
- uses: gradle/actions/wrapper-validation@v5
- name: Set up JDK
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
java-version: |
21
25
- name: Set the current release version
id: release_version
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -66,13 +73,13 @@ jobs:
# Store the hash in a file, which is uploaded as a workflow artifact.
sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256
- name: Upload build artifacts
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: gradle-build-outputs
path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/*
retention-days: 5
- name: Upload artifacts-sha256
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: artifacts-sha256
path: artifacts-sha256
Expand Down Expand Up @@ -115,7 +122,7 @@ jobs:
artifacts-sha256: ${{ steps.set-hash.outputs.artifacts-sha256 }}
steps:
- name: Download artifacts-sha256
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
with:
name: artifacts-sha256
# The SLSA provenance generator expects the hash digest of artifacts to be passed as a job
Expand Down Expand Up @@ -146,9 +153,9 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: Download artifacts
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
with:
name: gradle-build-outputs
path: build/repo
Expand All @@ -160,6 +167,6 @@ jobs:
- name: Upload assets
# Upload the artifacts to the existing release. Note that the SLSA provenance will
# attest to each artifact file and not the aggregated ZIP file.
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
with:
files: artifacts.zip
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'io.micronaut.build.internal.test-resources-simple-module'
id 'io.micronaut.build.internal.test-fixtures'
id "io.micronaut.build.internal.kotlin-base"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ This doesn't look right: all extensions are not Kotlin projects. The Kotlin plugin should only be applied where Kotlin is used.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}

components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# a managed version (a version which alias starts with "managed-"

[versions]
micronaut = "4.9.10"
micronaut = "4.10.8"
micronaut-platform = "4.9.4"
micronaut-aot = "2.5.0"
micronaut-aws = "4.11.0"
Expand All @@ -39,7 +39,7 @@ micronaut-redis = "6.9.0"
micronaut-security = "4.15.0"
micronaut-serde = "2.15.5"
micronaut-sql = "6.3.1"
micronaut-test = "4.9.0"
micronaut-test = "4.10.2"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you get rid of this version?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

groovy = "4.0.28"
spock = "2.3-groovy-4.0"
vertx-client = "4.5.14"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pluginManagement {
}

plugins {
id 'io.micronaut.build.shared.settings' version '8.0.0-M5'
id 'io.micronaut.build.shared.settings' version '8.0.0-M8'
}
rootProject.name = 'testresources-parent'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ dependencies {
testAnnotationProcessor(mn.micronaut.inject.java)
testImplementation(mnTest.micronaut.test.junit5)
testFixturesAnnotationProcessor(mn.micronaut.inject.java)
testFixturesApi(libs.junit.platform.launcher)
testFixturesApi(mnTest.junit.platform.launcher)
testFixturesApi(platform(mnTest.micronaut.test.bom))
testFixturesImplementation(projects.micronautTestResourcesClient)
testRuntimeOnly(libs.junit.jupiter.engine)
testRuntimeOnly(mnTest.junit.jupiter.engine)
testRuntimeOnly(mn.micronaut.context)
testRuntimeOnly(mn.snakeyaml)
testRuntimeOnly(mnSerde.micronaut.serde.jackson)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ dependencies {
annotationProcessor(mn.micronaut.inject.java)
api(projects.micronautTestResourcesExtensionsCore)
api(projects.micronautTestResourcesClient)
implementation(libs.junit.jupiter.api)
implementation(libs.junit.platform.launcher)
implementation(mnTest.junit.jupiter.api)
implementation(mnTest.junit.platform.launcher)
compileOnly(mnTest.micronaut.test.spock) {
because("This project provides a Spock extension for @Shared fields")
}
testAnnotationProcessor(mn.micronaut.inject.java)
testImplementation(mnTest.micronaut.test.junit5)
testFixturesAnnotationProcessor(mn.micronaut.inject.java)
testFixturesApi(libs.junit.platform.launcher)
testFixturesApi(mnTest.junit.platform.launcher)
testFixturesApi(platform(mnTest.micronaut.test.bom))
testFixturesImplementation(projects.micronautTestResourcesClient)
testFixturesImplementation(projects.micronautTestResourcesExtensionsCore)
testRuntimeOnly(libs.junit.jupiter.engine)
testRuntimeOnly(mnTest.junit.jupiter.engine)
testRuntimeOnly(mn.micronaut.context)
testRuntimeOnly(mn.snakeyaml)
testRuntimeOnly(mnSerde.micronaut.serde.jackson)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {

testAnnotationProcessor(mn.micronaut.inject.java)
testImplementation(mnTest.micronaut.test.junit5)
testRuntimeOnly(libs.junit.jupiter.engine)
testRuntimeOnly(mnTest.junit.jupiter.engine)
}

micronautBuild {
Expand Down
Loading