From dde575c48194776eb2ef35714a982cd594b95346 Mon Sep 17 00:00:00 2001 From: LEO Yoon-Tsaw Date: Mon, 20 May 2024 19:15:28 -0400 Subject: [PATCH] Update release-ci --- .github/workflows/release-ci.yml | 4 ++-- Makefile | 2 +- package/make_archive | 7 ++++++- package/{sign.bash => sign_app} | 3 +++ 4 files changed, 12 insertions(+), 4 deletions(-) rename package/{sign.bash => sign_app} (88%) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index c18f55bed..dc06b355f 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -40,7 +40,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') uses: ncipollo/release-action@v1 with: - artifacts: "package/*.zip" + artifacts: "package/Squirrel-*.pkg" body: | ${{ steps.release_log.outputs.changelog }} draft: true @@ -55,4 +55,4 @@ jobs: prerelease: true title: "Nightly build" files: | - package/*.zip + package/Squirrel-*.pkg diff --git a/Makefile b/Makefile index 6487b67a3..0680f4f09 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ clean-sparkle: package: release ifdef DEV_ID - package/sign.bash $(DEV_ID) + bash package/sign_app $(DEV_ID) endif bash package/make_package ifdef DEV_ID diff --git a/package/make_archive b/package/make_archive index 1b345757f..c1679fb2c 100755 --- a/package/make_archive +++ b/package/make_archive @@ -36,7 +36,12 @@ else create_archive fi -signature=$(sign_update "${target_pkg}") +if signature=$(sign_update "${target_pkg}"); then + echo "sign update is successful." +else + echo "sign_update not working, skiping signing update." + exit 0 +fi edSignature=$(echo $signature | awk -F'"' '{print $2}') length=$(echo $signature | awk -F'"' '{print $4}') pub_date=$(date -R) diff --git a/package/sign.bash b/package/sign_app similarity index 88% rename from package/sign.bash rename to package/sign_app index 3b2266c3b..c89f5b31a 100755 --- a/package/sign.bash +++ b/package/sign_app @@ -1,3 +1,6 @@ +#! /bin/bash +# enconding: utf-8 + appDir="build/Release/Squirrel.app" entitlement="resources/Squirrel.entitlements"