Merge pull request #13 from sourceplusplus/win

Update build.yml

Author: BFergerson

.github/workflows/build.yml

@@ -19,6 +19,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: ayltai/setup-graalvm@v1
+        with:
+          java-version: 11
+          graalvm-version: 21.3.0
+          native-image: true
 
       - name: Build native spp-cli
         run: gradle assemble nativeImage -Dbuild.profile=release
@@ -36,29 +41,37 @@ jobs:
           name: spp-cli-macOS.zip
           path: ./spp-cli-macOS.zip
 
-#   buildOnWindows:
-#     runs-on: windows-2016
-
-#     steps:
-#       - uses: actions/checkout@v2
-#       - uses: microsoft/setup-msbuild@v1.0.2
-#       - uses: seanmiddleditch/gha-setup-vsdevenv@master
-
-#       - name: Build native spp-cli.exe
-#         run: ./gradlew assemble nativeImage --debug --info --stacktrace
-#         shell: powershell
-#       - run: ls build/graal
-# #       - name: Run UPX
-# #         uses: crazy-max/ghaction-upx@v1.3.3
-# #         with:
-# #           version: latest
-# #           file: target/demo-cli.exe
-# #           args: '-7'
-#       - uses: actions/upload-artifact@v2
-#         with:
-#           if-no-files-found: warn
-#           name: spp-cli.exe
-#           path: build/graal/spp-cli.exe
+  buildOnWindows:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/setup-msbuild@v1.0.2
+      - uses: seanmiddleditch/gha-setup-vsdevenv@master
+      - uses: ayltai/setup-graalvm@v1
+        with:
+          java-version: 11
+          graalvm-version: 21.3.0
+          native-image: true
+
+      - name: Build native spp-cli.exe
+        run: ./gradlew assemble nativeImage '-Dbuild.profile=release'
+        shell: powershell
+      - name: Run UPX
+        uses: crazy-max/ghaction-upx@v1.3.3
+        with:
+          version: latest
+          file: build/graal/spp-cli.exe
+          args: '-7'
+
+      - name: Zip CLI
+        run: jar -cfM spp-cli-win64.zip build/graal/
+
+      - uses: actions/upload-artifact@v2
+        with:
+          if-no-files-found: warn
+          name: spp-cli-win64.zip
+          path: ./spp-cli-win64.zip
 
   buildOnLinux:
     runs-on: ubuntu-latest
@@ -68,12 +81,11 @@ jobs:
       version: ${{ steps.properties.outputs.version }}
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: ayltai/setup-graalvm@v1
         with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
+          java-version: 11
+          graalvm-version: 21.3.0
+          native-image: true
 
       - name: Export Properties
         id: properties
@@ -90,14 +102,6 @@ jobs:
         run: docker inspect --format='{{.Name}} - {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq)
       - name: Set SPP_PLATFORM_HOST
         run: SPP_PLATFORM_HOST=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=spp-platform")) && echo "SPP_PLATFORM_HOST=$SPP_PLATFORM_HOST" >> $GITHUB_ENV
-      - run: sleep 30s
-
-      - run: ./gradlew test -Dtest.profile=integration
-
-      - name: Compress CLI
-        uses: svenstaro/upx-action@v2
-        with:
-          file: build/graal/spp-cli
 
       - name: "[CLI] Get developers"
         run: ./build/graal/spp-cli -v admin get-developers
@@ -153,6 +157,15 @@ jobs:
         run: ./build/graal/spp-cli -v get-logs
       - name: "[CLI] Remove live instruments"
         run: ./build/graal/spp-cli -v remove-instruments spp.example.webapp.model.User 48
+      - name: "[CLI] Reset"
+        run: ./build/graal/spp-cli -v admin reset
+
+      - run: ./gradlew test -Dtest.profile=integration
+
+      - name: Compress CLI
+        uses: svenstaro/upx-action@v2
+        with:
+          file: build/graal/spp-cli
 
       - name: Zip spp-cli
         run: zip spp-cli-linux64.zip -j build/graal/spp-cli
@@ -161,10 +174,10 @@ jobs:
         with:
           name: spp-cli-linux64.zip
           path: ./spp-cli-linux64.zip
-          
+
   releaseDraft:
     name: Release Draft
-    needs: [buildOnMac, buildOnLinux]
+    needs: [ buildOnMac, buildOnWindows, buildOnLinux ]
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'
     steps:
@@ -205,6 +218,21 @@ jobs:
           asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-macOS.zip
           asset_content_type: application/zip
 
+      - name: Download spp-cli-win64 artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: spp-cli-win64.zip
+
+      - name: Upload spp-cli-win64 asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.createDraft.outputs.upload_url }}
+          asset_path: ./spp-cli-win64.zip
+          asset_name: spp-cli-${{ needs.buildOnWindows.outputs.version }}-win64.zip
+          asset_content_type: application/zip
+
       - name: Download spp-cli-linux64 artifact
         uses: actions/download-artifact@v2
         with:

build.gradle.kts

@@ -1,8 +1,8 @@
 import java.util.*
 
 plugins {
+    id("org.mikeneck.graalvm-native-image")
     id("com.github.johnrengelman.shadow")
-    id("com.palantir.graal")
     id("com.apollographql.apollo3")
     id("com.avast.gradle.docker-compose")
     kotlin("jvm")
@@ -79,15 +79,21 @@ tasks.create("createProperties") {
 }
 tasks["processResources"].dependsOn("createProperties")
 
-graal {
-    graalVersion(project.properties["graalVersion"] as String)
-    javaVersion("11")
-    mainClass("spp.cli.Main")
-    outputName("spp-cli")
-    option("-H:+PrintClassInitialization")
-    option("-H:+ReportExceptionStackTraces")
-    option("-H:IncludeResourceBundles=build")
-    option("-H:+AddAllCharsets")
+configurations {
+    create("empty")
+}
+
+nativeImage {
+    dependsOn("shadowJar")
+    setClasspath(File(project.buildDir, "libs/spp-cli-$version.jar"))
+    runtimeClasspath = configurations.getByName("empty")
+    graalVmHome = System.getenv("GRAALVM_HOME")
+    buildType { build ->
+        build.executable(main = "spp.cli.Main")
+    }
+    executableName = "spp-cli"
+    outputDirectory = file("$buildDir/graal")
+    arguments("--no-fallback")
 }
 
 tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {

e2e/config/spp-platform.yml

@@ -11,9 +11,8 @@ spp-platform:
   processor:
     bridge_port: 5460
 
-redis:
-  host: localhost
-  port: 6379
+storage:
+  selector: memory
 
 skywalking-oap:
   host: localhost

e2e/docker-compose.yml

@@ -10,17 +10,8 @@ services:
       - "5445:5445"
       - "5450:5450"
       - "5455:5455"
-    depends_on:
-      - redis
-    links:
-      - redis
     environment:
       - SPP_CLUSTER_URL=localhost
       - SPP_CLUSTER_NAME=docker
-      - SPP_REDIS_HOST=redis
       - SPP_SKYWALKING_HOST=skywalking-oap
       - SPP_DISABLE_JWT=true
-  redis:
-    image: redis:6.2.1
-    container_name: redis
-    hostname: redis

settings.gradle

@@ -10,8 +10,8 @@ pluginManagement {
         id 'com.avast.gradle.docker-compose' version "0.14.11" apply false
         id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false
         id 'com.github.johnrengelman.shadow' version "7.1.2"
-        id 'com.palantir.graal' version "0.10.0"
         id 'com.apollographql.apollo3' version "3.0.0"
+        id 'org.mikeneck.graalvm-native-image' version "v1.4.0"
     }
 }