update org.graalvm.buildtools:native-maven-plugin to 0.9.14

apache · Sep 23, 2022 · ca840e8 · ca840e8
1 parent dff6b28
commit ca840e8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
@@ -20,16 +20,13 @@ on:
 # TODO
 #  schedule:
 #    - cron: '0 0 * * *'
-  pull_request:
-    branches:
-      - master
-
-env: 
-  TARGET_DIR: /home/runner/work/shardingsphere/shardingsphere/shardingsphere-distribution/shardingsphere-proxy-distribution/target
+  push:
+    branches: [ graalvm-native-image ]
 
 jobs:
   build:
-    if: github.repository == 'apache/shardingsphere'
+# TODO
+#    if: github.repository == 'apache/shardingsphere'
     timeout-minutes: 90
     permissions:
       contents: read
@@ -39,7 +36,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-      fail-fast: false
+# TODO
+#      fail-fast: false
     steps:
       - uses: actions/checkout@v2
       - uses: graalvm/setup-graalvm@v1
@@ -49,8 +47,6 @@ jobs:
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache: 'maven'
-      # Test TODO
       - name: Build with Maven
         run: |
-          ./mvnw -am -pl shardingsphere-distribution/shardingsphere-proxy-distribution -B -Prelease -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Drat.skip=true clean install
-          ./mvnw -am -pl shardingsphere-distribution/shardingsphere-proxy-distribution -B -Pgunzip.untar,native -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Drat.skip=true clean install
+          ./mvnw -am -pl shardingsphere-distribution/shardingsphere-proxy-distribution -B -Prelease,untar,native -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Drat.skip=true clean install
diff --git a/shardingsphere-distribution/shardingsphere-proxy-distribution/pom.xml b/shardingsphere-distribution/shardingsphere-proxy-distribution/pom.xml
@@ -29,7 +29,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <native.maven.plugin.version>0.9.13</native.maven.plugin.version>
+        <native.maven.plugin.version>0.9.14</native.maven.plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     </properties>
 
@@ -225,7 +225,7 @@
             </build>
         </profile>
         <profile>
-            <id>gunzip.untar</id>
+            <id>untar</id>
             <build>
                 <plugins>
                     <plugin>
@@ -235,12 +235,12 @@
                         <executions>
                             <execution>
                                 <id>prepare</id>
-                                <phase>validate</phase>
+                                <phase>package</phase>
                                 <configuration>
-                                    <tasks>
-                                        <gunzip src="target/${project.build.finalName}-shardingsphere-proxy-bin.tar.gz" dest="target/"/>
-                                        <untar src="target/${project.build.finalName}-shardingsphere-proxy-bin.tar" dest="target/"/>
-                                    </tasks>
+                                    <target>
+                                        <untar src="target/${project.build.finalName}-shardingsphere-proxy-bin.tar.gz" compression="gzip" dest="target/"/>
+                                        <mkdir dir="target/${project.build.finalName}-SNAPSHOT-shardingsphere-proxy-bin/ext-lib"/>
+                                    </target>
                                 </configuration>
                                 <goals>
                                     <goal>run</goal>
@@ -264,7 +264,7 @@
                             <execution>
                                 <id>build-native</id>
                                 <goals>
-                                    <goal>build</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
@@ -283,7 +283,7 @@
                             <verbose>true</verbose>
                             <classpath>
                                 <entry>target/${project.build.finalName}-shardingsphere-proxy-bin/conf</entry>
-                                <entry>.</entry>
+                                <entry>target/${project.build.finalName}-shardingsphere-proxy-bin/bin</entry>
                                 <entry>target/${project.build.finalName}-shardingsphere-proxy-bin/lib/*</entry>
                                 <entry>target/${project.build.finalName}-shardingsphere-proxy-bin/ext-lib/*</entry>
                             </classpath>