From 3887dc11d0bf250260c7d6636f30f390cf90bb63 Mon Sep 17 00:00:00 2001 From: Balazs Perlaki-Horvath Date: Sun, 14 Jan 2024 23:44:52 +0100 Subject: [PATCH] Restore dependencies download, re-enable archive to apple --- .github/workflows/cd.yml | 19 +++++++++---------- src/generate_and_download.py | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1e6723d..3e72063 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -54,10 +54,9 @@ jobs: - name: Install Kiwix dependencies run: | - # cd apple - # brew bundle - # cd .. - brew install xcodegen + cd apple + brew bundle + cd .. - name: Generate project based on tag env: @@ -179,9 +178,9 @@ jobs: plutil -insert destination -string upload ./export.plist plutil -insert method -string $EXPORT_METHOD ./export.plist - # - name: Upload Archive to Apple (App Store or Notarization) - # env: - # APPLE_STORE_AUTH_KEY_PATH: ${{ env.APPLE_STORE_AUTH_KEY_PATH }} - # APPLE_STORE_AUTH_KEY_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ID }} - # APPLE_STORE_AUTH_KEY_ISSUER_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ISSUER_ID }} - # run: xcrun xcodebuild -exportArchive -archivePath $PWD/Kiwix-$VERSION.xcarchive -exportPath $PWD/export/ -exportOptionsPlist export.plist -authenticationKeyPath $APPLE_STORE_AUTH_KEY_PATH -allowProvisioningUpdates -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID + - name: Upload Archive to Apple (App Store or Notarization) + env: + APPLE_STORE_AUTH_KEY_PATH: ${{ env.APPLE_STORE_AUTH_KEY_PATH }} + APPLE_STORE_AUTH_KEY_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ID }} + APPLE_STORE_AUTH_KEY_ISSUER_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ISSUER_ID }} + run: xcrun xcodebuild -exportArchive -archivePath $PWD/Kiwix-$VERSION.xcarchive -exportPath $PWD/export/ -exportOptionsPlist export.plist -authenticationKeyPath $APPLE_STORE_AUTH_KEY_PATH -allowProvisioningUpdates -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID diff --git a/src/generate_and_download.py b/src/generate_and_download.py index 3df7afe..f43ae56 100644 --- a/src/generate_and_download.py +++ b/src/generate_and_download.py @@ -34,7 +34,7 @@ def main(): custom_apps.create_plists(custom_plist=Path("Custom.plist")) # download the zim files - # custom_apps.download_zim_files() + custom_apps.download_zim_files() # finally create the project file, containing all brands as targets custom_apps.create_custom_project_file(path=Path("custom_project.yml"))