diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e113573..8b39aaf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,6 +9,7 @@ on: branches: [ master ] pull_request: branches: [ master ] + workflow_dispatch: jobs: build: @@ -24,7 +25,8 @@ jobs: run: | wget -q https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz tar xzf apache-maven-3.5.4-bin.tar.gz - echo "$PWD/apache-maven-3.8.8/bin" >> $GITHUB_PATH + echo "$PWD/apache-maven-3.5.4/bin" >> $GITHUB_PATH + mvn -v - if: ${{ matrix.version == '8' }} name: Set up JDK 8 @@ -40,7 +42,7 @@ jobs: - if: ${{ matrix.version == '8' }} name: Build FOR JDK8 - run: mvn assembly:single -f pom.xml + run: mvn clean package -DskipTests -f pom.xml - if: ${{ matrix.version == '11' }} name: Set up JDK 11 ${{ matrix.version }} @@ -52,4 +54,19 @@ jobs: - if: ${{ matrix.version == '11' }} name: Build FOR JDK11 - run: mvn assembly:single -f pom-jdk11.xml + run: mvn clean package -DskipTests -f pom-jdk11.xml + + - name: Collect jars + shell: bash + run: | + set -euxo pipefail + mkdir -p dist + find . -type f -path "*/target/*" -name "fofaviewer-jar-with-dependencies.jar" -print -exec cp -v {} dist/ \; + ls -lah dist + + - name: Upload jar artifacts + uses: actions/upload-artifact@v4 + with: + name: fofa_viewer-jdk${{ matrix.version }}-jars + path: dist/*.jar + if-no-files-found: error diff --git a/pom-jdk11.xml b/pom-jdk11.xml index 8971160..f6ecc31 100644 --- a/pom-jdk11.xml +++ b/pom-jdk11.xml @@ -170,6 +170,15 @@ + + + make-assembly + package + + single + + + @@ -189,4 +198,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index f76d1d3..5c6c1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,16 @@ + + + make-assembly + package + + single + + + - \ No newline at end of file + diff --git a/src/main/java/org/fofaviewer/main/MainApp.java b/src/main/java/org/fofaviewer/main/MainApp.java index f8dbe40..50b65c6 100644 --- a/src/main/java/org/fofaviewer/main/MainApp.java +++ b/src/main/java/org/fofaviewer/main/MainApp.java @@ -7,7 +7,7 @@ import org.fofaviewer.controllers.MainController; public class MainApp extends Application { - private final String version = "1.1.15"; + private final String version = "1.1.16"; @Override public void start(Stage stage) throws Exception {