Merge branch 'refs/heads/4.5.x' into jooq-gradle-plugin

# Conflicts: # gradle/templates.versions.toml
micronaut-projects · May 6, 2024 · 26567ca · 26567ca
2 parents 8d1a10f + a9b625d
commit 26567ca
Show file tree

Hide file tree

Showing 471 changed files with 7,120 additions and 4,139 deletions.
diff --git a/.github/workflows/aws-lambda-snapshot.yml b/.github/workflows/aws-lambda-snapshot.yml
@@ -2,7 +2,7 @@ name: Snapshot to AWS Lambda
 on:
   push:
     branches:
-      - 4.3.x
+      - 4.5.x
 jobs:
   deploy:
     name: Deploy Job
@@ -31,7 +31,7 @@ jobs:
           GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
           GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
       - name: AWS Lambda Deploy
-        uses: appleboy/lambda-action@v0.1.9
+        uses: appleboy/lambda-action@v0.2.0
         with:
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/gcf-snapshot.yml b/.github/workflows/gcf-snapshot.yml
@@ -2,7 +2,7 @@ name: Snapshot to GCF
 on:
   push:
     branches:
-      - 4.3.x
+      - 4.5.x
 jobs:
   deploy:
     name: Deploy job

diff --git a/.github/workflows/gcr-snapshot.yml b/.github/workflows/gcr-snapshot.yml
@@ -2,7 +2,7 @@ name: Snapshot to GCR
 on:
   push:
     branches:
-      - 4.3.x
+      - 4.5.x
 jobs:
   deploy:
     name: Deploy job

diff --git a/.github/workflows/mavenCentral.yml b/.github/workflows/mavenCentral.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: v${{ github.event.inputs.release_version }}
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/mn-linux-snapshot.yml b/.github/workflows/mn-linux-snapshot.yml
@@ -16,10 +16,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1.1.5
+        uses: graalvm/setup-graalvm@v1.1.9
         with:
-          version: '22.3.2'
           java-version: '17'
+          distribution: 'graalvm-community'
           native-image-musl: 'true'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -42,8 +42,8 @@ jobs:
           cp ./LICENSE mn-linux-amd64-snapshot/
           zip -r mn-linux-amd64-snapshot.zip ./mn-linux-amd64-snapshot
       - name: "🆙 Upload Snapshot"
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.0.x'
-        uses: actions/upload-artifact@v3
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.5.x'
+        uses: actions/upload-artifact@v4
         with:
           name: mn-linux-amd64-snapshot
           path: mn-linux-amd64-snapshot.zip
diff --git a/.github/workflows/mn-macos-snapshot.yml b/.github/workflows/mn-macos-snapshot.yml
@@ -7,19 +7,19 @@ on:
     branches:
       - '[1-9]+.[0-9]+.x'
 jobs:
-  build:
-    name: Builds OS X Native CLI
-    runs-on: macos-latest
+  intel:
+    name: Builds OS X Intel Native CLI
+    runs-on: macos-13
     steps:
       - name: "⬇ Checkout the repository"
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1.1.5
+        uses: graalvm/setup-graalvm@v1.1.9
         with:
-          version: '22.3.2'
           java-version: '17'
+          distribution: 'graalvm-community'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "📸 Build the Native Image"
@@ -41,8 +41,47 @@ jobs:
           cp ./LICENSE mn-darwin-amd64-snapshot/
           zip -r mn-darwin-amd64-snapshot.zip ./mn-darwin-amd64-snapshot -x '*.DS_Store*' -x '__MAC_OSX'
       - name: "🆙 Upload Snapshot"
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.0.x'
-        uses: actions/upload-artifact@v3
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.5.x'
+        uses: actions/upload-artifact@v4
         with:
           name: mn-darwin-amd64-snapshot
           path: mn-darwin-amd64-snapshot.zip
+  arm:
+    name: Builds OS X Arm Native CLI
+    runs-on: macos-latest
+    steps:
+      - name: "⬇ Checkout the repository"
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: "☕️ Setup GraalVM CE"
+        uses: graalvm/setup-graalvm@v1.1.9
+        with:
+          java-version: '17'
+          distribution: 'graalvm-community'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: "📸 Build the Native Image"
+        run: ./gradlew micronaut-cli:nativeCompile --no-daemon
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
+          GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
+      - name: "✅ Verify Build"
+        run: ./starter-cli/build/native/nativeCompile/mn --version
+      - name: "✅ Verify Create App"
+        run: ./starter-cli/build/native/nativeCompile/mn create-app test
+      - name: "👷‍♀️Package Build"
+        env:
+          VERSION: ${{ github.event.release.tag_name }}
+        run: |
+          mkdir -p mn-darwin-aarch64-snapshot/bin
+          mv ./starter-cli/build/native/nativeCompile/mn mn-darwin-aarch64-snapshot/bin
+          cp ./LICENSE mn-darwin-aarch64-snapshot/
+          zip -r mn-darwin-aarch64-snapshot.zip ./mn-darwin-aarch64-snapshot -x '*.DS_Store*' -x '__MAC_OSX'
+      - name: "🆙 Upload Snapshot"
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.4.x'
+        uses: actions/upload-artifact@v4
+        with:
+          name: mn-darwin-aarch64-snapshot
+          path: mn-darwin-aarch64-snapshot.zip
diff --git a/.github/workflows/mn-windows-snapshot.yml b/.github/workflows/mn-windows-snapshot.yml
@@ -16,10 +16,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1.1.5
+        uses: graalvm/setup-graalvm@v1.1.9
         with:
-          version: '22.3.2'
           java-version: '17'
+          distribution: 'graalvm-community'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "📸 Build the Native Image"
@@ -46,8 +46,8 @@ jobs:
           Copy-Item "./LICENSE" -Destination "./mn-win-amd64-snapshot"
           Compress-Archive -Path "./mn-win-amd64-snapshot" -Update -DestinationPath ./mn-win-amd64-snapshot.zip
       - name: "🆙 Upload Snapshot"
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.0.x'
-        uses: actions/upload-artifact@v3
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/4.5.x'
+        uses: actions/upload-artifact@v4
         with:
           name: mn-win-amd64-snapshot
           path: ./mn-win-amd64-snapshot.zip
diff --git a/.github/workflows/release-manually.yml b/.github/workflows/release-manually.yml
@@ -9,7 +9,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Snapshot to GCF @@
     on:
       push:
         branches:
-          - 4.3.x
+          - 4.5.x
     jobs:
       deploy:
         name: Deploy job
@@ Expand Down @@