diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6846d5dea..3edcb039ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: security unlock-keychain -p $MACOS_CERTIFICATE_PWD signing_temp.keychain security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_CERTIFICATE_PWD signing_temp.keychain echo "===========jpackage app image begin================" - jpackage --verbose --name ${{ env.pkg-name }} --app-version ${{steps.previoustag.outputs.tag}} --mac-package-name ${{ env.pkg-name }} --type app-image -i app/bundle/target/scala-2.13/ --main-class org.bitcoins.bundle.AppBundle --main-jar ${{ env.pkg-assembly }} --icon app/gui/src/main/resources/icons/bitcoin-s.icns --mac-sign --mac-signing-keychain /Users/runner/Library/Keychains/signing_temp.keychain-db --mac-signing-key-user-name "Chris Stewart (9ZG3GPKHX8)" + jpackage --verbose --name ${{ env.pkg-name }} --app-version ${{steps.previoustag.outputs.tag}} --mac-package-name ${{ env.pkg-name }} --type app-image -i app/bundle/target/scala-2.13/ --main-class org.bitcoins.bundle.gui.BundleGUI --main-jar ${{ env.pkg-assembly }} --icon app/gui/src/main/resources/icons/bitcoin-s.icns --mac-sign --mac-signing-keychain /Users/runner/Library/Keychains/signing_temp.keychain-db --mac-signing-key-user-name "Chris Stewart (9ZG3GPKHX8)" echo "===========jpackage dmg begin================" jpackage --verbose --name ${{ env.pkg-name }} --app-version ${{steps.previoustag.outputs.tag}} --mac-package-name ${{ env.pkg-name }} --type dmg --app-image bitcoin-s.app --mac-sign --mac-signing-key-user-name "Chris Stewart (9ZG3GPKHX8)" echo "Signing dmg with code sign" @@ -127,7 +127,7 @@ jobs: - name: Package jar as debian package env: pkg-version: ${{steps.previoustag.outputs.tag}} - run: "jpackage --linux-shortcut --name ${{ env.pkg-name }} --app-version ${{steps.previoustag.outputs.tag}} --type deb -i app/bundle/target/scala-2.13/ --main-class org.bitcoins.bundle.AppBundle --main-jar ${{ env.pkg-assembly }} --icon app/gui/src/main/resources/icons/bitcoin-s.png" + run: "jpackage --linux-shortcut --name ${{ env.pkg-name }} --app-version ${{steps.previoustag.outputs.tag}} --type deb -i app/bundle/target/scala-2.13/ --main-class org.bitcoins.bundle.gui.BundleGUI --main-jar ${{ env.pkg-assembly }} --icon app/gui/src/main/resources/icons/bitcoin-s.png" - name: View Artifacts run: ls -l - name: Print working dir diff --git a/app/bundle/bundle.sbt b/app/bundle/bundle.sbt index b2c6d808df..82ea318964 100644 --- a/app/bundle/bundle.sbt +++ b/app/bundle/bundle.sbt @@ -1,13 +1,13 @@ name := "bitcoin-s-bundle" -mainClass := Some("org.bitcoins.bundle.BundleGUI") +mainClass := Some("org.bitcoins.bundle.gui.BundleGUI") publish / skip := true // Fork a new JVM for 'run' and 'test:run' to avoid JavaFX double initialization problems fork := true -assembly / mainClass := Some("org.bitcoins.bundle.BundleGUI") +assembly / mainClass := Some("org.bitcoins.bundle.gui.BundleGUI") assembly / assemblyJarName := s"${name.value}.jar"