restore package.yaml, fix signing

slovensko-digital · Jul 7, 2023 · 03199b6 · 03199b6
1 parent f0187fa
commit 03199b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix:
         config:
-          # - os: ubuntu-latest
+          - os: ubuntu-latest
           - os: macos-latest
-          # - os: windows-latest
+          - os: windows-latest
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -93,7 +93,7 @@
 
     {
       "label": "MacOS: Send package for notarization",
-      "command": "xcrun notarytool submit --keychain-profile \"autogram\" --keychain $APPLE_KEYCHAIN_PATH --wait target/Autogram-*.pkg",
+      "command": "pkgutil --check-signature target/Autogram-*.pkg && xcrun notarytool submit --keychain-profile \"autogram\" --keychain $APPLE_KEYCHAIN_PATH --wait target/Autogram-*.pkg",
       "options": {
         "env": {
           "JAVA_HOME": "${config:java.jdt.ls.java.home}",

diff --git a/src/main/scripts/resources/Autogram-post-image.sh b/src/main/scripts/resources/Autogram-post-image.sh
@@ -1,3 +1,4 @@
+#!/bin/bash -e
 TARGET="$(cd ../images/*/*/Contents;pwd)"
 SOURCE="$(cd ../../mac-launcher;pwd)"
 
@@ -11,7 +12,7 @@ chmod +x "$TARGET/MacOS/Autogram"
 
 # codesign changed executables
 ENTITLEMENTS=../../Autogram.entitlements
-if [ "$JPACKAGE_MAC_SIGN" = "1"]; then
+if [[ "$JPACKAGE_MAC_SIGN" == "1" ]]; then
     codesign -s "$APPLE_DEVELOPER_IDENTITY" --keychain $APPLE_KEYCHAIN_PATH --entitlements "$ENTITLEMENTS" --options=runtime --deep --timestamp --force "$TARGET/MacOS/Autogram"
     codesign -s "$APPLE_DEVELOPER_IDENTITY" --keychain $APPLE_KEYCHAIN_PATH --entitlements "$ENTITLEMENTS" --options=runtime --deep --timestamp --force "$TARGET/MacOS/AutogramApp"
 fi