Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
build:
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
11 changes: 10 additions & 1 deletion pom-jdk11.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,15 @@
</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
Expand All @@ -189,4 +198,4 @@

</plugins>
</build>
</project>
</project>
11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,16 @@
</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion src/main/java/org/fofaviewer/main/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading