+1

bardsoftware · Sep 30, 2024 · 25318c6 · 25318c6
1 parent e0c9d55
commit 25318c6
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 102 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -147,17 +147,21 @@ jobs:
                   java-version: 17.0.12
                   java-package: jdk+fx
                   cache: 'gradle'
-#            - name: Build GanttProject
-#              run: |
-#                  ./gradlew distbin
-#                  echo "===== PLUGINS ====="
-#                  ls ganttproject-builder/dist-bin/plugins/base
+            - name: Build GanttProject
+              run: |
+                  ./gradlew distbin
+                  echo "===== PLUGINS ====="
+                  ls ganttproject-builder/dist-bin/plugins/base
+
+            - name: Build GanttProject.app
+              run: |
+                  ./build-bin/package-mac.sh
+                  ./build/GanttProject.app/Contents/MacOS/GanttProject -h || echo "failed to run"
+
+            - name: Sign GanttProject.app
+              run: |
+                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "$MACOS_NOTARIZE_PASSWORD" all
 
-#            - name: Build GanttProject.app
-#              run: |
-#                  ./build-bin/package-mac.sh
-#                  ./build/GanttProject.app/Contents/MacOS/GanttProject -h || echo "failed to run"
-#
             - id: 'auth'
               uses: 'google-github-actions/auth@v1'
               with:
@@ -168,102 +172,61 @@ jobs:
 
             - name: 'Use gcloud CLI'
               run: 'gcloud info'
-#
-#            - name: Sign GanttProject.app
-#              run: |
-#                  echo "------------------ PREPARING KEYCHAINS ------------------------"
-#                  echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-#
-#                  security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-#                  security default-keychain -s build.keychain
-#                  security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-#                  security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-#                  security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-#
-#                  echo "------------------ SIGNING ------------------------"
-#                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "--" sign build.keychain
-#                  jpackage --type dmg --app-image build/GanttProject.app -n "ganttproject" --dest build/
-#
-#                  echo "------------------ NOTARIZING ------------------------"
-#                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "$MACOS_NOTARIZE_PASSWORD" notarize
-#                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "--" staple
-#                  rm build/*.dmg
-#
+
             - uses: actions/setup-python@v5
               with:
                 python-version: '3.10'
             - run: |
-                  mkdir -p build
-                  curl -o build/GanttProject.zip https://storage.googleapis.com/dl.ganttproject.biz/GanttProject.zip
-                  cd build && unzip GanttProject.zip && cd ..
                   pip install dmgbuild
                   dmgbuild -s build-cfg/dmgbuild.py "$MAC_APP_NAME" ./ganttproject-$VERSION-silicon.dmg
                   gsutil cp ./ganttproject-$VERSION-silicon.dmg gs://dl.ganttproject.biz && gsutil acl ch -u AllUsers:R gs://dl.ganttproject.biz/ganttproject-$VERSION-silicon.dmg;
 
-#    macOS_intel:
-#        runs-on: macos-13
-#        steps:
-#            - uses: actions/checkout@v3
-#            - name: Checkout submodules
-#              shell: bash
-#              run: |
-#                  git submodule sync --recursive
-#                  git submodule update --init --force --recursive --depth=1
-#                  echo "$VERSION" > ganttproject-builder/VERSION
-#            - uses: actions/setup-java@v3
-#              with:
-#                  distribution: 'liberica'
-#                  java-version: 17.0.12
-#                  java-package: jdk+fx
-#                  cache: 'gradle'
-#            - name: Build GanttProject
-#              run: |
-#                  ./gradlew distbin
-#                  echo "===== PLUGINS ====="
-#                  ls ganttproject-builder/dist-bin/plugins/base
-#
-#            - name: Build GanttProject.app
-#              run: |
-#                  ./build-bin/package-mac.sh
-#                  ./build/GanttProject.app/Contents/MacOS/GanttProject -h || echo "failed to run"
-#
-#            - name: Sign GanttProject.app
-#              run: |
-#                  echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-#
-#                  security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-#                  security default-keychain -s build.keychain
-#                  security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-#                  security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-#                  security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-#
-#                  echo "------------------ NOW SIGNING ------------------------"
-#
-#                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "--" sign build.keychain
-#
-#                  jpackage --type dmg --app-image build/GanttProject.app -n "ganttproject" --dest build/
-#                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "$MACOS_NOTARIZE_PASSWORD" notarize
-#                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "--" staple
-#                  rm build/*.dmg
-#                  jpackage --type dmg --app-image build/GanttProject.app -n "ganttproject" --dest build/
-#                  cd build
-#                  mv ganttproject-1.0.dmg ganttproject-$VERSION-intel.dmg
-#
-#            - id: 'auth'
-#              uses: 'google-github-actions/auth@v1'
-#              with:
-#                  credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
-#
-#            - name: 'Set up Cloud SDK'
-#              uses: 'google-github-actions/setup-gcloud@v1'
-#
-#            - name: 'Use gcloud CLI'
-#              run: 'gcloud info'
-#
-#            - name: Upload artifacts
-#              run: |
-#                  #!/bin/sh
-#                  cd build
-#                  for f in *.dmg; do
-#                    gsutil cp $f gs://dl.ganttproject.biz && gsutil acl ch -u AllUsers:R gs://dl.ganttproject.biz/$f;
-#                  done;
+    macOS_intel:
+        runs-on: macos-13
+        steps:
+            - uses: actions/checkout@v3
+            - name: Checkout submodules
+              shell: bash
+              run: |
+                  git submodule sync --recursive
+                  git submodule update --init --force --recursive --depth=1
+                  echo "$VERSION" > ganttproject-builder/VERSION
+            - uses: actions/setup-java@v3
+              with:
+                  distribution: 'liberica'
+                  java-version: 17.0.12
+                  java-package: jdk+fx
+                  cache: 'gradle'
+            - name: Build GanttProject
+              run: |
+                  ./gradlew distbin
+                  echo "===== PLUGINS ====="
+                  ls ganttproject-builder/dist-bin/plugins/base
+
+            - name: Build GanttProject.app
+              run: |
+                  ./build-bin/package-mac.sh
+                  ./build/GanttProject.app/Contents/MacOS/GanttProject -h || echo "failed to run"
+
+            - name: Sign GanttProject.app
+              run: |
+                  build-bin/notarize.sh $VERSION "BarD Software s.r.o" "$MACOS_NOTARIZE_PASSWORD" all
+
+            - id: 'auth'
+              uses: 'google-github-actions/auth@v1'
+              with:
+                  credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
+
+            - name: 'Set up Cloud SDK'
+              uses: 'google-github-actions/setup-gcloud@v1'
+
+            - name: 'Use gcloud CLI'
+              run: 'gcloud info'
+
+            - uses: actions/setup-python@v5
+              with:
+                  python-version: '3.10'
+            - run: |
+                  pip install dmgbuild
+                  dmgbuild -s build-cfg/dmgbuild.py "$MAC_APP_NAME" ./ganttproject-$VERSION-intel.dmg
+                  gsutil cp ./ganttproject-$VERSION-intel.dmg gs://dl.ganttproject.biz && gsutil acl ch -u AllUsers:R gs://dl.ganttproject.biz/ganttproject-$VERSION-intel.dmg;
diff --git a/build-bin/notarize.sh b/build-bin/notarize.sh
@@ -23,6 +23,26 @@ do_staple() {
 	xcrun stapler staple build/GanttProject.app
 }
 
+do_all() {
+    echo "------------------ PREPARING KEYCHAINS ------------------------"
+    echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+
+    security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    security default-keychain -s build.keychain
+    security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+
+    echo "------------------ SIGNING ------------------------"
+    do_prepare
+    jpackage --type dmg --app-image build/GanttProject.app -n "ganttproject" --dest build/
+
+    echo "------------------ NOTARIZING ------------------------"
+    do_notarize
+    do_staple
+    rm build/*.dmg
+}
+
 case $COMMAND in
 sign)
     do_prepare
@@ -33,6 +53,9 @@ notarize)
 staple)
     do_staple
     ;;
+all)
+    do_all
+    ;;
 *)
     echo "Unknown command: $COMMAND" && exit 1
     ;;

diff --git a/ganttproject-builder/BUILD-HISTORY-MAJOR b/ganttproject-builder/BUILD-HISTORY-MAJOR
@@ -2,5 +2,5 @@
 2024-05-28 3309 again, now with macOS Intel in the workflow
 2024-09-30 3312 Package deps for Ubuntu and new public key for updates
 2024-09-30 3312 again, with update JRE and hopefully with notarized macOS Silicon
-2024-09-30 3312 +1
+2024-09-30 3312 again, maybe now we will build pretty signed notarized packages
 --