wip gh action

edigonzales · Oct 23, 2022 · 861a7f8 · 861a7f8
1 parent 7856d13
commit 861a7f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -60,16 +60,16 @@ jobs:
           mkdir -p ${{ env.INSTALL_DIR }}
           tar -C ${{ env.INSTALL_DIR }} -xzf libericavm.zip
 
-      - name: 'Download ili2c'
-        run: |
-          curl -L https://downloads.interlis.ch/ili2c/ili2c-5.3.0.zip -o ili2c.zip
-          unzip ili2c.zip -d ili2c-dir
+      # - name: 'Download ili2c'
+      #   run: |
+      #     curl -L https://downloads.interlis.ch/ili2c/ili2c-5.3.0.zip -o ili2c.zip
+      #     unzip ili2c.zip -d ili2c-dir
 
       - name: 'Create native image'
         run: |
           export JAVA_HOME=$PWD/${{ env.NIK_HOME }}/Contents/Home
           export PATH=$JAVA_HOME/bin:$PATH
-          ./gradlew nativeCompile nativeImageDistZip
+          ./gradlew nativeCompile nativeImageDistZip -i
 
       - uses: actions/upload-artifact@v2
         if: ${{ success() }}

diff --git a/build.gradle b/build.gradle
@@ -8,11 +8,14 @@ apply from: "$rootDir/gradle/versioning.gradle"
 
 //version '1.12.1'+System.getProperty('release','-SNAPSHOT')
 
+def APP_VERSION = "5.3.0"
+
 def myArtifactId = "ili2c"
+def buildNumber = System.env.GITHUB_RUN_NUMBER
 def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem; 
 
 dependencies {
-    implementation "ch.interlis:ili2c-tool:5.3.0" // TODO: parametrize
+    implementation "ch.interlis:ili2c-tool:${APP_VERSION}" // TODO: parametrize
 }
 
 repositories {
@@ -53,7 +56,7 @@ distributions {
 }
 
 nativeImageDistZip {
-    archiveName myArtifactId + '-' + project.version.toString() + '-' + getOperatingSystemName() + '-' + getArchitectureName() + ".zip"
+    archiveName myArtifactId + '-' + APP_VERSION + "_" + buildNumber + '-' + getOperatingSystemName() + '-' + getArchitectureName() + ".zip"
 }
 
 jreleaser {
@@ -84,7 +87,7 @@ jreleaser {
             //     platform = 'linux'
             // }
             artifact {
-                path = "../artifacts-native/ili2repo-${version}-osx-x86-64.zip"
+                path = "../artifacts-native/ili2repo-${APP_VERSION}_${buildNumber}-osx-x86-64.zip"
                 platform = 'osx'
             }
             // artifact {