Refactoring build configuration.

.github/workflows/build.yml

@@ -13,8 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
+    - name: Build jar
+      run: make jar
+
     - name: Build image
       run: make graal
-
-    - name: Build dist
-      run: make dist

.github/workflows/publish.yml

@@ -12,21 +12,26 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Build dist
-      run: make dist
+    - name: Build jar
+      run: make jar
 
-    - uses: klakegg/github-upload@v0.8.3
+    - name: Build image
+      run: make graal
+
+    - uses: klakegg/github-upload@v0.9.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        file: target/dist.zip
-        name: xsdchecker-${TAG}.zip
-        label: Distribution (zip)
+        file: target/xsdchecker.jar
+        name: xsdchecker-${TAG}.jar
+        label: JAR file
+        type: application/java-archive
 
-    - uses: klakegg/github-upload@v0.8.3
+    - uses: klakegg/github-upload@v0.9.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        file: target/dist.tar.gz
-        name: xsdchecker-${TAG}.tar.gz
-        label: Distribution (tar.gz)
+        file: target/xsdchecker
+        name: xsdchecker-${TAG}-linux-64bit
+        label: Executable (Linux 64bit)
+        type: application/x-executable

.gitignore

@@ -1,2 +1 @@
-/dist/Main.java
 target

Dockerfile

@@ -1,8 +1,9 @@
 FROM klakegg/graalvm-native AS graalvm
 
-COPY graal /src
+COPY graal /src/graal
+COPY java /src/java
 
-RUN sh /src/build.sh
+RUN cd /src/graal && sh build.sh
 
 
 FROM alpine:3.10

Makefile

@@ -1,13 +1,17 @@
-.PHONY: dist graal
+.PHONY: jar graal
 
 graal:
 	@docker build -t klakegg/xsdchecker:snapshot .
+	@docker run --rm -i \
+		-v $(shell pwd)/target:/target \
+		--entrypoint cp \
+		klakegg/xsdchecker:snapshot \
+		/bin/xsdchecker /target/xsdchecker
 
-dist:
+jar:
 	@docker run --rm -i \
-		-v $(shell pwd)/dist:/src \
-		-v $(shell pwd)/graal/Main.java:/src/Main.java \
+		-v $(shell pwd)/java:/src/java \
 		-v $(shell pwd)/target:/target \
-		--workdir /src \
+		--workdir /src/java \
 		openjdk:8u212-jdk-alpine3.9 \
 		sh build.sh

graal/build.sh

@@ -1,26 +1,14 @@
 #!/bin/sh
 
-# Create build folder
-mkdir -p /target/build
-
-# Compile class
-javac \
-  -d /target/build \
-  /src/Main.java
-
-# Generate jar
-jar \
-  -cfe /target/build/main.jar Main \
-  -C /target/build \
-  Main.class
+test -e /target/xsdchecker.jar || sh /src/java/build.sh
 
 # Create native image
 native-image \
   --static \
   --no-fallback \
   --allow-incomplete-classpath \
-  -jar /target/build/main.jar \
+  -jar /target/xsdchecker.jar \
   -H:Name=/target/bin/xsdchecker \
   -H:+ReportExceptionStackTraces \
-  -H:ReflectionConfigurationFiles=/src/java-xerces.json \
+  -H:ReflectionConfigurationFiles=/src/graal/java-xerces.json \
   -H:IncludeResourceBundles=com.sun.org.apache.xerces.internal.impl.msg.XMLSchemaMessages

java/build.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Create build folder
+mkdir -p /tmp/build /target
+
+# Compile class
+javac \
+  -d /tmp/build \
+  /src/java/src/Main.java
+
+# Generate jar
+jar \
+  -cfe /target/xsdchecker.jar Main \
+  -C /tmp/build \
+  Main.class