diff --git a/.github/workflows/graalvm-dev.yml b/.github/workflows/graalvm-dev.yml index 4dccaa704..27e011af6 100644 --- a/.github/workflows/graalvm-dev.yml +++ b/.github/workflows/graalvm-dev.yml @@ -20,11 +20,8 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build Matrix - uses: micronaut-projects/github-actions/graalvm/build-matrix@master + uses: micronaut-projects/github-actions/graalvm/build-matrix@latest-graalvm-changes id: build-matrix - with: - graalvm: 'dev' - java: '17' build: needs: build_matrix if: github.repository != 'micronaut-projects/micronaut-project-template' @@ -39,21 +36,21 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pre-Build Steps - uses: micronaut-projects/github-actions/graalvm/pre-build@master + uses: micronaut-projects/github-actions/graalvm/pre-build@latest-graalvm-changes id: pre-build with: - graalvm: ${{ matrix.graalvm }} - java: ${{ matrix.java }} + java: 'dev' - name: Build Steps uses: micronaut-projects/github-actions/graalvm/build@master id: build env: GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }} GH_USERNAME: ${{ secrets.GH_USERNAME }} + GRAALVM_QUICK_BUILD: true with: nativeTestTask: ${{ matrix.native_test_task }} - name: Post-Build Steps uses: micronaut-projects/github-actions/graalvm/post-build@master id: post-build with: - java: ${{ matrix.java }} + java: 'dev' diff --git a/.github/workflows/graalvm-latest.yml b/.github/workflows/graalvm-latest.yml index e9581676d..9e3b0f09e 100644 --- a/.github/workflows/graalvm-latest.yml +++ b/.github/workflows/graalvm-latest.yml @@ -26,11 +26,8 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build Matrix - uses: micronaut-projects/github-actions/graalvm/build-matrix@master + uses: micronaut-projects/github-actions/graalvm/build-matrix@latest-graalvm-changes id: build-matrix - with: - graalvm: 'latest' - java: '17' build: needs: build_matrix if: github.repository != 'micronaut-projects/micronaut-project-template' @@ -45,21 +42,22 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pre-Build Steps - uses: micronaut-projects/github-actions/graalvm/pre-build@master + uses: micronaut-projects/github-actions/graalvm/pre-build@latest-graalvm-changes id: pre-build with: - graalvm: ${{ matrix.graalvm }} - java: ${{ matrix.java }} + distribution: 'graalvm-community' + java: '17' - name: Build Steps uses: micronaut-projects/github-actions/graalvm/build@master id: build env: GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }} GH_USERNAME: ${{ secrets.GH_USERNAME }} + GRAALVM_QUICK_BUILD: true with: nativeTestTask: ${{ matrix.native_test_task }} - name: Post-Build Steps uses: micronaut-projects/github-actions/graalvm/post-build@master id: post-build with: - java: ${{ matrix.java }} + java: '17' diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d0c741c8a..1417889e6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -19,7 +19,6 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - graalvm: [ 'latest'] java: ['17'] env: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} @@ -48,9 +47,8 @@ jobs: - name: "🔧 Setup GraalVM CE" uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.graalvm }} + distribution: 'graalvm-community' java-version: ${{ matrix.java }} - components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🔧 Setup Gradle" diff --git a/.gitignore b/.gitignore index edaaa1a19..96f6376ba 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ src/main/docs/resources/css/*.css src/main/docs/resources/js/*.js src/main/docs/resources/style/*.html src/main/docs/resources/img/micronaut-logo-white.svg + +# Ignore files generated by test-resources +**/.micronaut/test-resources/ \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e..033e24c4c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..62f495dfe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb4..fcb6fca14 100755 --- a/gradlew +++ b/gradlew @@ -130,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can.