Skip to content

Commit eb1f4cc

Browse files
committed
feat: Externalize desktop macOS signing configuration
- Move macOS signing and notarization settings from `app/desktop/build.gradle.kts` to a new `gradle/common-desktop-mac-sign-conf.gradle` script. - Introduce a `keystore.properties` file in the `app/desktop` directory to hold signing and notarization values. - Update GitHub Actions scripts (`decrypt_secret.sh`, `encrypt_secret.sh`, `check_secret_integrity.sh`) to manage the new `desktop.keystore.properties.gpg` secret. - Rename the encrypted Android keystore from `keystore.properties.gpg` to `android.keystore.properties.gpg` for clarity.
1 parent 19f6945 commit eb1f4cc

14 files changed

+46
-17
lines changed

.github/scripts/check_secret_integrity.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ echo "7b9f841129997ddb098e03dd7099a3341dbfa012c31e4cb465b92ddd476cca7a ./app/io
1111
echo "e36a29b3964c8bd90030f93ac986a39510185df582a783f1b946e6127a005e38 ./app/iosApp/fastlane/ios_distribution.p12" | sha256sum -c -
1212

1313
echo "4fb66d6fbe9fc4a544303e6e516da2ee3314187e28fc5aacb9631f9b42b511b0 ./app/iosApp/fastlane/NoteDelight_Distribution_Profile.mobileprovision" | sha256sum -c -
14+
15+
echo "5439f53423060953d110cb3217e089b23da20aa7559e80b32767184f2516bba0 ./app/desktop/keystore.properties" | sha256sum -c -

.github/scripts/decrypt_secret.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# --batch to prevent interactive command --yes to assume "yes" for questions
55

66
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" \
7-
--output ./app/android/keystore.properties ./.github/secrets/keystore.properties.gpg
7+
--output ./app/android/keystore.properties ./.github/secrets/android.keystore.properties.gpg
88

99
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" \
1010
--output ./app/android/note_room_key_store.jks ./.github/secrets/note_room_key_store.jks.gpg
@@ -20,3 +20,6 @@ gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" \
2020

2121
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" \
2222
--output ./app/iosApp/fastlane/NoteDelight_Distribution_Profile.mobileprovision ./.github/secrets/NoteDelight_Distribution_Profile.mobileprovision.gpg
23+
24+
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" \
25+
--output ./app/desktop/keystore.properties ./.github/secrets/desktop.keystore.properties.gpg

.github/scripts/encrypt_secret.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# --batch to prevent interactive command --yes to assume "yes" for questions
55

66
gpg --symmetric --cipher-algo AES256 --batch --yes --passphrase="$LARGE_SECRET_PASSPHRASE" \
7-
--output ./.github/secrets/keystore.properties.gpg ./app/android/keystore.properties
7+
--output ./.github/secrets/android.keystore.properties.gpg ./app/android/keystore.properties
88

99
gpg --symmetric --cipher-algo AES256 --batch --yes --passphrase="$LARGE_SECRET_PASSPHRASE" \
1010
--output ./.github/secrets/note_room_key_store.jks.gpg ./app/android/note_room_key_store.jks
@@ -20,3 +20,6 @@ gpg --symmetric --cipher-algo AES256 --batch --yes --passphrase="$LARGE_SECRET_P
2020

2121
gpg --symmetric --cipher-algo AES256 --batch --yes --passphrase="$LARGE_SECRET_PASSPHRASE" \
2222
--output ./.github/secrets/NoteDelight_Distribution_Profile.mobileprovision.gpg ./app/iosApp/fastlane/NoteDelight_Distribution_Profile.mobileprovision
23+
24+
gpg --symmetric --cipher-algo AES256 --batch --yes --passphrase="$LARGE_SECRET_PASSPHRASE" \
25+
--output ./.github/secrets/desktop.keystore.properties.gpg ./app/desktop/keystore.properties
-1 Bytes
Binary file not shown.
Binary file not shown.

.github/secrets/android.keystore.properties.gpg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
� *����$�ҕ�����%���gNw���H�/Cg!�� )i:��l�;l�� y\����m�q@�*K�x�G� =�xY9�M��ּ�È��u�,5��w�|�J:��>fҏ^�%9;Zo_$^�x1)'M����'��ܐ�k��� ӯ���Aی����
Binary file not shown.

.github/secrets/desktop.keystore.properties.gpg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
� ���%
2+
�ޚ���Z���- ݒ��
3+
W߬|���?EC�FP�8\����\5�3��QuX)T}�h/u����Nh�-DĦT k�$^�Ig��3���}���Fj!��g:��ҝ����������e9�y~Ӆ��Oʧ����%��1��\ᩏ� +�m���F���1T�63�&�2{؏�e��:��!7�l;K�\���@`˳)����k^������q�[�5�DӞU���ܜ0��X*K��W�>c$� .\49����M���4y‡a�Ѹ#��y+��W:���[
0 Bytes
Binary file not shown.
-166 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)