From 8132e31b893055ceb7f2a68fc71d487fc8cbc1c8 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Sat, 11 Nov 2023 19:20:29 +0000 Subject: [PATCH 01/13] Swicth to LibraryPtr See https://github.com/kiwix/libkiwix/commit/1dc97055974a95245e17d14cf27e6376cb8ca416 --- Model/OPDSParser/OPDSParser.mm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Model/OPDSParser/OPDSParser.mm b/Model/OPDSParser/OPDSParser.mm index 5d309824a..6dd3fd73b 100644 --- a/Model/OPDSParser/OPDSParser.mm +++ b/Model/OPDSParser/OPDSParser.mm @@ -18,7 +18,7 @@ @interface OPDSParser () -@property kiwix::Library *library; +@property kiwix::LibraryPtr library; @end @@ -27,15 +27,11 @@ @implementation OPDSParser - (instancetype _Nonnull)init { self = [super init]; if (self) { - self.library = new kiwix::Library(); + self.library = kiwix::Library::create(); } return self; } -- (void)dealloc { - delete self.library; -} - - (BOOL)parseData:(nonnull NSData *)data { try { NSString *content = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; From c64044d2431a9b630ce89779f619f517e14cafd5 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Mon, 13 Nov 2023 13:58:57 +0000 Subject: [PATCH 02/13] added dummy CI workflow --- .github/ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/ci.yml diff --git a/.github/ci.yml b/.github/ci.yml new file mode 100644 index 000000000..163609932 --- /dev/null +++ b/.github/ci.yml @@ -0,0 +1,15 @@ +name: CI + +on: + pull_request: + push: + branches: + - main + - ci + +jobs: + test: + runs-on: ubuntu-22-04 + steps: + - name: Hello + run: echo "hello world" From aa58f2b57bd106ea451dc57870f97be7256d0637 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Mon, 13 Nov 2023 14:00:33 +0000 Subject: [PATCH 03/13] dummy action in correct location --- .github/{ => workflows}/ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/ci.yml (100%) diff --git a/.github/ci.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/ci.yml rename to .github/workflows/ci.yml From 001136d59e62c43e202fd1a7fb5adddbc1796598 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Mon, 13 Nov 2023 14:03:19 +0000 Subject: [PATCH 04/13] fixed image name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 163609932..c12cba137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: jobs: test: - runs-on: ubuntu-22-04 + runs-on: ubuntu-22.04 steps: - name: Hello run: echo "hello world" From 9298b978a541553328018b86c3ab2ea6f1627adf Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Mon, 13 Nov 2023 13:52:25 +0000 Subject: [PATCH 05/13] Introducing Continuous Integration Building both macOS App and iOS App on every commit on `main` and on PRs. Build is not used/uploaded but still requires to be signed. Signing is done by automatically requesting appropriate Dev certificate using Store API Key. --- .github/workflows/ci.yml | 60 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c12cba137..d53f113b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,8 +8,60 @@ on: - ci jobs: - test: - runs-on: ubuntu-22.04 + build: + strategy: + fail-fast: false + matrix: + destination: + - platform: macOS + name: Any Mac + - platform: iOS + name: Any iOS Device + runs-on: macos-13 + env: + XCF_URL: https://tmp.kiwix.org/ci/dev_preview/xcframework/libkiwix_xcframework-2023-11-11.tar.gz + # XCF_URL: https://download.kiwix.org/nightly/libkiwix_xcframework-2023-11-11.tar.gz + XC_PROJECT: Kiwix.xcodeproj + XC_SCHEME: Kiwix + XC_CONFIG: Release + XC_DESTINATION: platform=${{ matrix.destination.platform }},name=${{ matrix.destination.name }} + STORE_AUTH_KEY: /tmp/authkey.p8 steps: - - name: Hello - run: echo "hello world" + - name: Update Apple Intermediate Certificate + run: | + curl -L -o ~/Downloads/AppleWWDRCAG3.cer https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer + sudo security import ~/Downloads/AppleWWDRCAG3.cer \ + -k /Library/Keychains/System.keychain \ + -T /usr/bin/codesign \ + -T /usr/bin/security \ + -T /usr/bin/productbuild + - name: Set Xcode version (15.0.1) + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode + run: sudo xcode-select -s /Applications/Xcode_15.0.1.app + - name: Checkout code + uses: actions/checkout@v3 + - name: Download CoreKiwix.xcframework + run: curl -L -o - $XCF_URL | tar -x --strip-components 2 + - name: Prepare Xcode + run: xcrun xcodebuild -checkFirstLaunchStatus || xcrun xcodebuild -runFirstLaunch + - name: Dump build settings + run: xcrun xcodebuild -project Kiwix.xcodeproj -scheme Kiwix -showBuildSettings + - name: Copy Key file to disk + run: echo "%{{ secrets.APPLE_STORE_AUTH_KEY }}" > ${STORE_AUTH_KEY} && chmod 600 ${STORE_AUTH_KEY} + - name: Build for ${{ matrix.destination.platform }}/${{ matrix.destination.name }} + env: + 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 \ + -project ${XC_PROJECT} \ + -scheme ${XC_SCHEME} \ + -destination "${XC_DESTINATION}" \ + -configuration ${XC_CONFIG} \ + -onlyUsePackageVersionsFromResolvedFile \ + -derivedDataPath $PWD/build \ + -allowProvisioningUpdates \ + -authenticationKeyPath ${STORE_AUTH_KEY} \ + -authenticationKeyID ${APPLE_STORE_AUTH_KEY_ID} \ + -authenticationKeyIssuerID ${APPLE_STORE_AUTH_KEY_ISSUER_ID} \ + -verbose \ + build From 0a3c36417fd78560be7ff920e2d92d2b650467ab Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Mon, 13 Nov 2023 14:08:52 +0000 Subject: [PATCH 06/13] GH runner already has intermediate certificate --- .github/workflows/ci.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d53f113b4..9633f3a2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: XCF_URL: https://tmp.kiwix.org/ci/dev_preview/xcframework/libkiwix_xcframework-2023-11-11.tar.gz # XCF_URL: https://download.kiwix.org/nightly/libkiwix_xcframework-2023-11-11.tar.gz XC_PROJECT: Kiwix.xcodeproj + XC_WORKSPACE: Kiwix.xcodeproj/project.xcworkspace/ XC_SCHEME: Kiwix XC_CONFIG: Release XC_DESTINATION: platform=${{ matrix.destination.platform }},name=${{ matrix.destination.name }} @@ -34,7 +35,7 @@ jobs: -k /Library/Keychains/System.keychain \ -T /usr/bin/codesign \ -T /usr/bin/security \ - -T /usr/bin/productbuild + -T /usr/bin/productbuild || true - name: Set Xcode version (15.0.1) # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode run: sudo xcode-select -s /Applications/Xcode_15.0.1.app @@ -45,23 +46,11 @@ jobs: - name: Prepare Xcode run: xcrun xcodebuild -checkFirstLaunchStatus || xcrun xcodebuild -runFirstLaunch - name: Dump build settings - run: xcrun xcodebuild -project Kiwix.xcodeproj -scheme Kiwix -showBuildSettings + run: xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -showBuildSettings - name: Copy Key file to disk - run: echo "%{{ secrets.APPLE_STORE_AUTH_KEY }}" > ${STORE_AUTH_KEY} && chmod 600 ${STORE_AUTH_KEY} + run: echo "${{ secrets.APPLE_STORE_AUTH_KEY }}" > ${STORE_AUTH_KEY} && chmod 600 ${STORE_AUTH_KEY} - name: Build for ${{ matrix.destination.platform }}/${{ matrix.destination.name }} env: 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 \ - -project ${XC_PROJECT} \ - -scheme ${XC_SCHEME} \ - -destination "${XC_DESTINATION}" \ - -configuration ${XC_CONFIG} \ - -onlyUsePackageVersionsFromResolvedFile \ - -derivedDataPath $PWD/build \ - -allowProvisioningUpdates \ - -authenticationKeyPath ${STORE_AUTH_KEY} \ - -authenticationKeyID ${APPLE_STORE_AUTH_KEY_ID} \ - -authenticationKeyIssuerID ${APPLE_STORE_AUTH_KEY_ISSUER_ID} \ - -verbose \ - build + run: xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -destination "$XC_DESTINATION" -configuration $XC_CONFIG -onlyUsePackageVersionsFromResolvedFile -derivedDataPath $PWD/build -allowProvisioningUpdates -authenticationKeyPath $STORE_AUTH_KEY -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID -verbose build From da67eefdc574b84918320510b03a3117c3218ba9 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Mon, 13 Nov 2023 16:34:38 +0000 Subject: [PATCH 07/13] import apple-development certificate --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9633f3a2f..24b3e7f2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,31 @@ jobs: XC_CONFIG: Release XC_DESTINATION: platform=${{ matrix.destination.platform }},name=${{ matrix.destination.name }} STORE_AUTH_KEY: /tmp/authkey.p8 + CERTIFICATE: /tmp/apple-development.p12 + SIGNING_IDENTITY: ${{ secrets.APPLE_DEVELOPMENT_SIGNING_IDENTITY }} + KEYCHAIN: /Users/runner/build.keychain-db + KEYCHAIN_PASSWORD: mysecretpassword + KEYCHAIN_PROFILE: build-profile steps: + - name: install Apple certificate + shell: bash + run: | + echo "${{ secrets.APPLE_DEVELOPMENT_SIGNING_CERTIFICATE }}" | base64 --decode -o $CERTIFICATE + security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN + security default-keychain -s $KEYCHAIN + security set-keychain-settings $KEYCHAIN + security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN + security import $CERTIFICATE -k $KEYCHAIN -P "${{ secrets.APPLE_DEVELOPMENT_SIGNING_P12_PASSWORD }}" -A -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild + rm $CERTIFICATE + security set-key-partition-list -S apple-tool:,apple: -s -k $KEYCHAIN_PASSWORD $KEYCHAIN + security find-identity -v $KEYCHAIN + xcrun notarytool store-credentials \ + --apple-id "${{ secrets.APPLE_SIGNING_ALTOOL_USERNAME }}" \ + --password "${{ secrets.APPLE_SIGNING_ALTOOL_PASSWORD }}" \ + --team-id "${{ secrets.APPLE_SIGNING_TEAM }}" \ + --validate \ + --keychain $KEYCHAIN \ + $KEYCHAIN_PROFILE - name: Update Apple Intermediate Certificate run: | curl -L -o ~/Downloads/AppleWWDRCAG3.cer https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer From f8c863d29a8687e97a79e3d50ef3c4762334170c Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Tue, 14 Nov 2023 11:29:35 +0000 Subject: [PATCH 08/13] mark CoreKiwix.xcframework relative to root --- Kiwix.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index 922d260db..2e2bc8ae8 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ 97DA90D72975B0C100738365 /* LibraryRefreshViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibraryRefreshViewModelTest.swift; sourceTree = ""; }; 97DE2BA1283A8E5C00C63D9B /* LibraryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibraryViewModel.swift; sourceTree = ""; }; 97DE2BA4283A944100C63D9B /* GridCommon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GridCommon.swift; sourceTree = ""; }; - 97E88F4C2AE407320037F0E5 /* CoreKiwix.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = CoreKiwix.xcframework; sourceTree = ""; }; + 97E88F4C2AE407320037F0E5 /* CoreKiwix.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = CoreKiwix.xcframework; sourceTree = SOURCE_ROOT; }; 97E94B1D271EF250005B0295 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97E94B22271EF250005B0295 /* Kiwix.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Kiwix.entitlements; sourceTree = ""; }; 97F3332E28AFC1A2007FF53C /* SearchResults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResults.swift; sourceTree = ""; }; From 67a31f0a91fa35d65329c8e156066b40313b3c2a Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 15 Nov 2023 15:33:18 +0000 Subject: [PATCH 09/13] Running build up to twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only “reliable” way I found to succeed build in CI --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24b3e7f2f..79e5ca64c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,8 +73,11 @@ jobs: run: xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -showBuildSettings - name: Copy Key file to disk run: echo "${{ secrets.APPLE_STORE_AUTH_KEY }}" > ${STORE_AUTH_KEY} && chmod 600 ${STORE_AUTH_KEY} + - name: Install retry command + run: brew install kadwanev/brew/retry - name: Build for ${{ matrix.destination.platform }}/${{ matrix.destination.name }} env: 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 -workspace $XC_WORKSPACE -scheme $XC_SCHEME -destination "$XC_DESTINATION" -configuration $XC_CONFIG -onlyUsePackageVersionsFromResolvedFile -derivedDataPath $PWD/build -allowProvisioningUpdates -authenticationKeyPath $STORE_AUTH_KEY -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID -verbose build + FRAMEWORK_SEARCH_PATHS: /Users/runner/work/apple/apple/ + run: retry -t 2 -- xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -destination "$XC_DESTINATION" -configuration $XC_CONFIG -onlyUsePackageVersionsFromResolvedFile -derivedDataPath $PWD/build -allowProvisioningUpdates -authenticationKeyPath $STORE_AUTH_KEY -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID -verbose build From b3a3dbadc192cf526c6246fcb51b636bb1171b41 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 15 Nov 2023 16:07:38 +0000 Subject: [PATCH 10/13] Without auth key --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79e5ca64c..964ab1312 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,6 @@ jobs: XC_SCHEME: Kiwix XC_CONFIG: Release XC_DESTINATION: platform=${{ matrix.destination.platform }},name=${{ matrix.destination.name }} - STORE_AUTH_KEY: /tmp/authkey.p8 CERTIFICATE: /tmp/apple-development.p12 SIGNING_IDENTITY: ${{ secrets.APPLE_DEVELOPMENT_SIGNING_IDENTITY }} KEYCHAIN: /Users/runner/build.keychain-db @@ -71,13 +70,9 @@ jobs: run: xcrun xcodebuild -checkFirstLaunchStatus || xcrun xcodebuild -runFirstLaunch - name: Dump build settings run: xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -showBuildSettings - - name: Copy Key file to disk - run: echo "${{ secrets.APPLE_STORE_AUTH_KEY }}" > ${STORE_AUTH_KEY} && chmod 600 ${STORE_AUTH_KEY} - name: Install retry command run: brew install kadwanev/brew/retry - name: Build for ${{ matrix.destination.platform }}/${{ matrix.destination.name }} env: - APPLE_STORE_AUTH_KEY_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ID }} - APPLE_STORE_AUTH_KEY_ISSUER_ID: ${{ secrets.APPLE_STORE_AUTH_KEY_ISSUER_ID }} FRAMEWORK_SEARCH_PATHS: /Users/runner/work/apple/apple/ - run: retry -t 2 -- xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -destination "$XC_DESTINATION" -configuration $XC_CONFIG -onlyUsePackageVersionsFromResolvedFile -derivedDataPath $PWD/build -allowProvisioningUpdates -authenticationKeyPath $STORE_AUTH_KEY -authenticationKeyID $APPLE_STORE_AUTH_KEY_ID -authenticationKeyIssuerID $APPLE_STORE_AUTH_KEY_ISSUER_ID -verbose build + run: retry -t 2 -- xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -destination "$XC_DESTINATION" -configuration $XC_CONFIG -onlyUsePackageVersionsFromResolvedFile -derivedDataPath $PWD/build -allowProvisioningUpdates -verbose build From 55db5807df63ceb734eaa9ec09df66b586bde4d3 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 15 Nov 2023 16:19:57 +0000 Subject: [PATCH 11/13] additional comments --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 964ab1312..0b83cf007 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,6 +51,7 @@ jobs: --validate \ --keychain $KEYCHAIN \ $KEYCHAIN_PROFILE + # not necessary on github runner but serves as documentation for local setup - name: Update Apple Intermediate Certificate run: | curl -L -o ~/Downloads/AppleWWDRCAG3.cer https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer @@ -70,6 +71,7 @@ jobs: run: xcrun xcodebuild -checkFirstLaunchStatus || xcrun xcodebuild -runFirstLaunch - name: Dump build settings run: xcrun xcodebuild -workspace $XC_WORKSPACE -scheme $XC_SCHEME -showBuildSettings + # build is launched up to twice as it's common the build fails, looking for CoreKiwix module - name: Install retry command run: brew install kadwanev/brew/retry - name: Build for ${{ matrix.destination.platform }}/${{ matrix.destination.name }} From b195baa5b9e3d77697b3a0c7b135c389a6effb73 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Thu, 16 Nov 2023 09:53:35 +0000 Subject: [PATCH 12/13] using latest nightly redirect --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b83cf007..a70a29260 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ on: push: branches: - main - - ci jobs: build: @@ -19,8 +18,7 @@ jobs: name: Any iOS Device runs-on: macos-13 env: - XCF_URL: https://tmp.kiwix.org/ci/dev_preview/xcframework/libkiwix_xcframework-2023-11-11.tar.gz - # XCF_URL: https://download.kiwix.org/nightly/libkiwix_xcframework-2023-11-11.tar.gz + XCF_URL: https://download.kiwix.org/nightly/libkiwix_xcframework.tar.gz XC_PROJECT: Kiwix.xcodeproj XC_WORKSPACE: Kiwix.xcodeproj/project.xcworkspace/ XC_SCHEME: Kiwix From 66ee6f775928af5bae8cba6c585f2f18a5f08e3c Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Fri, 17 Nov 2023 16:10:20 +0000 Subject: [PATCH 13/13] using libkiwix release, set to 13.0.0 --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36f3ca910..ae6b1fa3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,10 @@ on: push: branches: - main + +env: + LIBKIWIX_VERSION: "13.0.0" + jobs: build: strategy: @@ -17,8 +21,6 @@ jobs: name: Any iOS Device runs-on: macos-13 env: - XCF_URL: https://download.kiwix.org/nightly/libkiwix_xcframework.tar.gz - XC_PROJECT: Kiwix.xcodeproj XC_WORKSPACE: Kiwix.xcodeproj/project.xcworkspace/ XC_SCHEME: Kiwix XC_CONFIG: Release @@ -63,6 +65,8 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - name: Download CoreKiwix.xcframework + env: + XCF_URL: https://download.kiwix.org/release/libkiwix/libkiwix_xcframework-${{ env.LIBKIWIX_VERSION }}.tar.gz run: curl -L -o - $XCF_URL | tar -x --strip-components 2 - name: Prepare Xcode run: xcrun xcodebuild -checkFirstLaunchStatus || xcrun xcodebuild -runFirstLaunch