diff --git a/.woodpecker.yml b/.woodpecker.yml index 8790d4b..6d66720 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,10 +12,7 @@ pipeline: build_platform_jars: image: git.frohnmeyer-wds.de/johannes/ci-wine commands: - - gradle --build-cache :launcher-dist:build -Pflavor=fat -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} - - gradle --build-cache :launcher-dist:build :launcher-dist:jpackage -Pflavor=windows -Ppublic -Pcrosscompile -Ptimestamp=${CI_PIPELINE_STARTED} - - gradle --build-cache :launcher-dist:build :launcher-dist:jpackage -Pflavor=linux -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} - - gradle --build-cache :launcher-dist:build -Pflavor=macos -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} + - ./platform_jars.sh - mv launcher-dist/build/jpackage/*.deb public/inceptum.deb - mv launcher-dist/build/jpackage/*.msi public/inceptum.msi - for f in launcher-dist/build/libs/Inceptum-*-*-*.jar; do mv "$f" "public/Inceptum-$${f##*-}"; done diff --git a/launcher-gtk/src/main/kotlin/module-info.java b/launcher-gtk/src/main/kotlin/module-info.java index b54d69d..5d1a639 100644 --- a/launcher-gtk/src/main/kotlin/module-info.java +++ b/launcher-gtk/src/main/kotlin/module-info.java @@ -6,7 +6,7 @@ module io.gitlab.jfronny.inceptum.launcher.gtk { requires org.gnome.gtk; requires org.gnome.adwaita; - // Should theoretically already be included with inceptum.lacuncher + // Should theoretically already be included transitively through inceptum.launcher and inceptum.common requires io.gitlab.jfronny.commons; requires java.desktop; } \ No newline at end of file diff --git a/platform_jars.sh b/platform_jars.sh new file mode 100755 index 0000000..7ea90ed --- /dev/null +++ b/platform_jars.sh @@ -0,0 +1,5 @@ +#!/bin/bash +gradle --build-cache :launcher-dist:build -Pflavor=fat -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} +gradle --build-cache :launcher-dist:build :launcher-dist:jpackage -Pflavor=windows -Ppublic -Pcrosscompile -Ptimestamp=${CI_PIPELINE_STARTED} +gradle --build-cache :launcher-dist:build :launcher-dist:jpackage -Pflavor=linux -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} +gradle --build-cache :launcher-dist:build -Pflavor=macos -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} \ No newline at end of file