Use official GH action (#54)

* Use official GH action Signed-off-by: Jordi Deu-Pons <[email protected]> * Fix workflow Signed-off-by: Jordi Deu-Pons <[email protected]> * Fix java launcher Signed-off-by: Jordi Deu-Pons <[email protected]> * bump upload-artifact v4 Signed-off-by: Jordi Deu-Pons <[email protected]> * update gradle Signed-off-by: Jordi Deu-Pons <[email protected]> * use GraalVM CE Signed-off-by: Jordi Deu-Pons <[email protected]> * use GraalVM CE Signed-off-by: Jordi Deu-Pons <[email protected]> * minor changes --------- Signed-off-by: Jordi Deu-Pons <[email protected]> Co-authored-by: munishchouhan <[email protected]>
seqeralabs · Sep 25, 2024 · 05a0bac · 05a0bac
1 parent adf439f
commit 05a0bac
Show file tree

Hide file tree

Showing 10 changed files with 223 additions and 152 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,6 @@ jobs:
     name: Linux
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
-    container: public.ecr.aws/seqera-labs/graalvm-static:21.3.0
     timeout-minutes: 90
 
     steps:
@@ -27,20 +26,18 @@ jobs:
           fetch-depth: 1
 
       - name: Setup Graalvm
-        uses: DeLaGuardo/setup-graalvm@master
+        uses: graalvm/setup-graalvm@v1
         with:
-          graalvm: '21.3.0'
-          java: 'java11'
-          arch: 'amd64'
-
-      - name: Install native-image component
-        run: gu install native-image
+          java-version: '21'
+          distribution: 'graalvm-community'
+          native-image-musl: 'true'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Tests
         run: ./gradlew cleanTest test
 
       - name: Tests reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: linux-test-reports
@@ -53,15 +50,15 @@ jobs:
         run: ./gradlew shadowJar
 
       - name: Upload linux native image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: tw_agent_linux
+          name: tw-agent-linux
           path: build/native/nativeCompile/tw-agent
 
       - name: Upload fat JAR artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: tw_agent_jar
+          name: tw-agent-jar
           path: build/libs/tw-agent.jar
 
 
@@ -77,12 +74,13 @@ jobs:
           fetch-depth: 0
 
       - name: Download all build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: Setup Java for JReleaser
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: '21'
+          distribution: 'adopt'
 
       - name: Version
         id: version

diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.3.0.r11-grl
+java=21.0.2-graalce
diff --git a/build.gradle b/build.gradle
@@ -91,8 +91,8 @@ task buildInfo {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.toVersion("21")
+    targetCompatibility = JavaVersion.toVersion("21")
     options.compilerArgs += ["-Aproject=${project.name}"]
     dependsOn buildInfo
 }
@@ -121,6 +121,10 @@ graalvmNative {
             buildArgs.add('-H:+AddAllCharsets')
             buildArgs.add('-H:EnableURLProtocols=https,http')
             buildArgs.add('-H:+ReportExceptionStackTraces')
+
+            javaLauncher = javaToolchains.launcherFor {
+                languageVersion = JavaLanguageVersion.of(17)
+            }
         }
 
         test {

diff --git a/graalvm-static/Dockerfile b/graalvm-static/Dockerfile
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,23 @@
+#
+# Copyright 2023, Seqera Labs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists