From 50fa535a3313eba8eab664bb7c82d71b49fd76d6 Mon Sep 17 00:00:00 2001 From: Jaap Date: Wed, 1 Jun 2022 10:47:19 +0200 Subject: [PATCH 01/14] Appstore fixes --- .DS_Store | Bin 6148 -> 6148 bytes .../project.pbxproj | 11 ++++++++--- .../xcschemes/ProjectAccessibility.xcscheme | 3 ++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ ios/ProjectAccessibility/AppDelegate.h | 2 ++ ios/ProjectAccessibility/Info.plist | 2 -- 6 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 ios/ProjectAccessibility.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.DS_Store b/.DS_Store index ed126b9c3645586e08c8c273a67cf1d676e72306..0572934ca82d8c16412c2f60c6ceaba0c983170b 100644 GIT binary patch delta 249 zcmZoMXfc@J&nUbxU^g?P@Ma#CQ;hXV<;4X_Ir&Kp3=BJx3UV@wOAHLIF)}f;u(Gjp zuyb&8#0F>Nmj{<5mXsDdB^E`4cp>@uIY}^fVp3RUYI(eXh;x2kNn&PRY7tmNW=bkh zNlbWVUP^wsQ+{b)N-U}m z*0&Cd&(6us%kKg@4hR?-Av6Ool!j5=lh3fW2{SWfGUPK9mjxH)<>cq3gEUMmyt0{{ H<1aq|MIlB4 delta 32 ocmZoMXfc@J&nUPtU^g?P;AS3{Q;d_Bu+?lV-O9L`o#QV*0I>ZF8~^|S diff --git a/ios/ProjectAccessibility.xcodeproj/project.pbxproj b/ios/ProjectAccessibility.xcodeproj/project.pbxproj index 9b58117..fca8540 100644 --- a/ios/ProjectAccessibility.xcodeproj/project.pbxproj +++ b/ios/ProjectAccessibility.xcodeproj/project.pbxproj @@ -136,7 +136,6 @@ B7E8F1892175DCF8962DB987 /* Pods-ProjectAccessibility-ProjectAccessibilityTests.debug.xcconfig */, 02F602DD29E5A74B2B228A7E /* Pods-ProjectAccessibility-ProjectAccessibilityTests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -464,6 +463,7 @@ "DEBUG=1", "$(inherited)", ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = ProjectAccessibilityTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -488,6 +488,7 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = ProjectAccessibilityTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -514,7 +515,9 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; + DEVELOPMENT_TEAM = 4JDV9X82QN; ENABLE_BITCODE = NO; + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = ProjectAccessibility/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -525,7 +528,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = com.app.normal.bartimeus.projectaccessibility; PRODUCT_NAME = ProjectAccessibility; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -541,6 +544,8 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; + DEVELOPMENT_TEAM = 4JDV9X82QN; + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = ProjectAccessibility/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -551,7 +556,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = com.app.normal.bartimeus.projectaccessibility; PRODUCT_NAME = ProjectAccessibility; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/ProjectAccessibility.xcodeproj/xcshareddata/xcschemes/ProjectAccessibility.xcscheme b/ios/ProjectAccessibility.xcodeproj/xcshareddata/xcschemes/ProjectAccessibility.xcscheme index 02ffcac..7a7d244 100644 --- a/ios/ProjectAccessibility.xcodeproj/xcshareddata/xcschemes/ProjectAccessibility.xcscheme +++ b/ios/ProjectAccessibility.xcodeproj/xcshareddata/xcschemes/ProjectAccessibility.xcscheme @@ -75,7 +75,7 @@ diff --git a/ios/ProjectAccessibility.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/ProjectAccessibility.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/ProjectAccessibility.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/ProjectAccessibility/AppDelegate.h b/ios/ProjectAccessibility/AppDelegate.h index ef1de86..9ffffb6 100644 --- a/ios/ProjectAccessibility/AppDelegate.h +++ b/ios/ProjectAccessibility/AppDelegate.h @@ -1,5 +1,7 @@ #import #import +#import "ReactNativeConfig.h" +@import RadarSDK; @interface AppDelegate : UIResponder diff --git a/ios/ProjectAccessibility/Info.plist b/ios/ProjectAccessibility/Info.plist index cf6b7ff..9b85b6d 100644 --- a/ios/ProjectAccessibility/Info.plist +++ b/ios/ProjectAccessibility/Info.plist @@ -81,8 +81,6 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UIViewControllerBasedStatusBarAppearance From 0647c85c4779ab9ee15eac41701c3c18432f94da Mon Sep 17 00:00:00 2001 From: Jaap Date: Wed, 1 Jun 2022 11:02:07 +0200 Subject: [PATCH 02/14] Plist fix --- ios/ProjectAccessibility/Info.plist | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ios/ProjectAccessibility/Info.plist b/ios/ProjectAccessibility/Info.plist index 9b85b6d..9650a0b 100644 --- a/ios/ProjectAccessibility/Info.plist +++ b/ios/ProjectAccessibility/Info.plist @@ -49,6 +49,14 @@ NSPhotoLibraryUsageDescription $(PRODUCT_NAME) wilt graag je gallerij openen + NSContactsUsageDescription + $(PRODUCT_NAME) wilt graag je contacten openen + NSAppleMusicUsageDescription + $(PRODUCT_NAME) wilt graag je Apple Music openen + NSSpeechRecognitionUsageDescription + $(PRODUCT_NAME) wilt graag je spraak herkenning gebruiken + NSLocationWhenInUseUsageDescription + $(PRODUCT_NAME) wilt graag je locatie gebruiken UIAppFonts Muli-ExtraBold.ttf From 2358358783317b75bada97b541af86f972a2852f Mon Sep 17 00:00:00 2001 From: Jaap Date: Wed, 1 Jun 2022 13:45:10 +0200 Subject: [PATCH 03/14] Test build --- .github/workflows/ios-appstore.yml | 64 ++++++++++++++++++++++++++++++ ios/Podfile.lock | 4 +- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/ios-appstore.yml diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml new file mode 100644 index 0000000..8215899 --- /dev/null +++ b/.github/workflows/ios-appstore.yml @@ -0,0 +1,64 @@ +name: Build iOS app and publish on App store + +on: + push: + branches: + - main + - develop + pull_request: + + obs: + build-android-adhoc: + runs-on: macOS-latest + name: "Build iOS app" + + strategy: + matrix: + node-version: [16.x] + + steps: + - name: Getting the repo + uses: actions/checkout@v2 + + # Install node + - name: Installing node + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + + # Install React Native CLI, used to bundle the app + - name: Install React Native CLI + run: | + yarn global add react-native-cli + + # Install Yarn dependencies + - name: Install Yarn dependencies + run: | + yarn install + + - name: Make envfile Acceptation + if: github.ref == 'refs/heads/main' + uses: SpicyPizza/create-envfile@v1.3 + with: + envkey_ENDPOINT_TO_ENFORCE: ${{ secrets.ACC_ENDPOINT_TO_ENFORCE }} + envkey_API_KEY: ${{ secrets.ACC_API_KEY }} + envkey_RADAR_PUBLISHABLE_KEY: ${{ secrets.RADAR_PUBLISHABLE_KEY }} + + - name: Make envfile Development + if: github.ref != 'refs/heads/main' + uses: SpicyPizza/create-envfile@v1.3 + with: + envkey_ENDPOINT_TO_ENFORCE: ${{ secrets.DEV_ENDPOINT_TO_ENFORCE }} + envkey_API_KEY: ${{ secrets.DEV_API_KEY }} + envkey_RADAR_PUBLISHABLE_KEY: ${{ secrets.RADAR_PUBLISHABLE_KEY }} + + # Build iOS app + - uses: sparkfabrik/ios-build-action@v1.2.0 + name: Build iOS + with: + project-path: ./ios/ProjectAccessibility.xcodeproj + p12-base64: ${{ secrets.P12_BASE64 }} + mobileprovision-base64: ${{ secrets.MOBILEPROVISION_BASE64 }} + code-signing-identity: ${{ secrets.CODE_SIGNING_IDENTITY }} + team-id: ${{ secrets.TEAM_ID }} + workspace-path: ProjectAccessibility.xcworkspace # optional \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a7cf7b8..7b50f33 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -633,7 +633,7 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 + glog: bbaccdf9af7ec106ed6f0eb086217dc2bf37414c libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b @@ -648,7 +648,7 @@ SPEC CHECKSUMS: Permission-PhotoLibrary: ddb5a158725b29cb12e9e477e8a5f5151c66cc3c Permission-SpeechRecognition: fdab73ea6aec7103fef3ef8719194e9ef65dbb9e RadarSDK: 71706b7bc57c8cef02c4fadb3e71e92eb746d80a - RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 + RCT-Folly: 19dac003a3f572f05a3b77277df72906a73469f1 RCTRequired: 3c77b683474faf23920fbefc71c4e13af21470c0 RCTTypeSafety: 720b1841260dac692444c2822b27403178da8b28 React: 25970dd74abbdac449ca66dec4107652cacc606d From 0723ee1b4b6e504c49eb3875e477ed2615f64921 Mon Sep 17 00:00:00 2001 From: Jaap Date: Wed, 1 Jun 2022 13:46:57 +0200 Subject: [PATCH 04/14] typo --- .github/workflows/ios-appstore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml index 8215899..a24d3ba 100644 --- a/.github/workflows/ios-appstore.yml +++ b/.github/workflows/ios-appstore.yml @@ -7,7 +7,7 @@ on: - develop pull_request: - obs: + jobs: build-android-adhoc: runs-on: macOS-latest name: "Build iOS app" From 46e071f96644d424030bd4cc4d1a169f19a3f6d3 Mon Sep 17 00:00:00 2001 From: Jaap Date: Wed, 1 Jun 2022 13:47:31 +0200 Subject: [PATCH 05/14] format --- .github/workflows/ios-appstore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml index a24d3ba..34e2fc1 100644 --- a/.github/workflows/ios-appstore.yml +++ b/.github/workflows/ios-appstore.yml @@ -7,7 +7,7 @@ on: - develop pull_request: - jobs: +jobs: build-android-adhoc: runs-on: macOS-latest name: "Build iOS app" From 60ebf2323b90a9e4aea403d1d910675c746e405e Mon Sep 17 00:00:00 2001 From: Jaap Date: Wed, 1 Jun 2022 13:53:17 +0200 Subject: [PATCH 06/14] ubuntu --- .github/workflows/ios-appstore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml index 34e2fc1..93d963c 100644 --- a/.github/workflows/ios-appstore.yml +++ b/.github/workflows/ios-appstore.yml @@ -9,7 +9,7 @@ on: jobs: build-android-adhoc: - runs-on: macOS-latest + runs-on: ubuntu-latest name: "Build iOS app" strategy: From ccd31d41cb9fbea2cf848e1e4d2cc4c4a68dccd3 Mon Sep 17 00:00:00 2001 From: Jaap Date: Thu, 2 Jun 2022 10:24:15 +0200 Subject: [PATCH 07/14] Change strings --- ios/ProjectAccessibility/Info.plist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/ProjectAccessibility/Info.plist b/ios/ProjectAccessibility/Info.plist index 9650a0b..baca17e 100644 --- a/ios/ProjectAccessibility/Info.plist +++ b/ios/ProjectAccessibility/Info.plist @@ -36,7 +36,7 @@ NSCameraUsageDescription - $(PRODUCT_NAME) wilt graag je camera gebruiken + De camera wordt gebruikt om een volledig antwoord op de vraag te kunnen geven NSLocationAlwaysAndWhenInUseUsageDescription $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling NSLocationAlwaysUsageDescription @@ -44,11 +44,11 @@ NSLocationWhenInUseUsageDescription NSMicrophoneUsageDescription - $(PRODUCT_NAME) wilt graag je microfoon gebruiken. + De microfoon wordt gebruikt om een volledig antwoord op de vraag te kunnen geven NSPhotoLibraryAddUsageDescription NSPhotoLibraryUsageDescription - $(PRODUCT_NAME) wilt graag je gallerij openen + $(PRODUCT_NAME) wilt graag je gallerij openen om een foto toe te voegen aan je antwoord voor de vragenlijst NSContactsUsageDescription $(PRODUCT_NAME) wilt graag je contacten openen NSAppleMusicUsageDescription @@ -56,7 +56,7 @@ NSSpeechRecognitionUsageDescription $(PRODUCT_NAME) wilt graag je spraak herkenning gebruiken NSLocationWhenInUseUsageDescription - $(PRODUCT_NAME) wilt graag je locatie gebruiken + De locatie wordt gebruikt om zo de dichtsbijzijnde onderdelen te kunnen tonen in de vragenlijst. UIAppFonts Muli-ExtraBold.ttf From d601f0f647807ebc8fb28bad6cb011c4b5871fe5 Mon Sep 17 00:00:00 2001 From: Jaap Date: Thu, 2 Jun 2022 10:26:46 +0200 Subject: [PATCH 08/14] Add . --- ios/ProjectAccessibility/Info.plist | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ios/ProjectAccessibility/Info.plist b/ios/ProjectAccessibility/Info.plist index baca17e..36bcadd 100644 --- a/ios/ProjectAccessibility/Info.plist +++ b/ios/ProjectAccessibility/Info.plist @@ -36,25 +36,25 @@ NSCameraUsageDescription - De camera wordt gebruikt om een volledig antwoord op de vraag te kunnen geven + De camera wordt gebruikt om een volledig antwoord op de vraag te kunnen geven. NSLocationAlwaysAndWhenInUseUsageDescription - $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling + $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling. NSLocationAlwaysUsageDescription - $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling + $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling. NSLocationWhenInUseUsageDescription NSMicrophoneUsageDescription - De microfoon wordt gebruikt om een volledig antwoord op de vraag te kunnen geven + De microfoon wordt gebruikt om een volledig antwoord op de vraag te kunnen geven. NSPhotoLibraryAddUsageDescription NSPhotoLibraryUsageDescription - $(PRODUCT_NAME) wilt graag je gallerij openen om een foto toe te voegen aan je antwoord voor de vragenlijst + $(PRODUCT_NAME) wilt graag je gallerij openen om een foto toe te voegen aan je antwoord voor de vragenlijst. NSContactsUsageDescription - $(PRODUCT_NAME) wilt graag je contacten openen + $(PRODUCT_NAME) wilt graag je contacten openen. NSAppleMusicUsageDescription - $(PRODUCT_NAME) wilt graag je Apple Music openen + $(PRODUCT_NAME) wilt graag je Apple Music openen. NSSpeechRecognitionUsageDescription - $(PRODUCT_NAME) wilt graag je spraak herkenning gebruiken + $(PRODUCT_NAME) wilt graag je spraak herkenning gebruiken. NSLocationWhenInUseUsageDescription De locatie wordt gebruikt om zo de dichtsbijzijnde onderdelen te kunnen tonen in de vragenlijst. UIAppFonts From 4e2597507b4f61dae96d3bf26e3bc97138462768 Mon Sep 17 00:00:00 2001 From: Jaap Date: Fri, 3 Jun 2022 11:03:38 +0200 Subject: [PATCH 09/14] Remove GH action for now --- .github/workflows/ios-appstore.yml | 64 ------------------------------ 1 file changed, 64 deletions(-) delete mode 100644 .github/workflows/ios-appstore.yml diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml deleted file mode 100644 index 93d963c..0000000 --- a/.github/workflows/ios-appstore.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Build iOS app and publish on App store - -on: - push: - branches: - - main - - develop - pull_request: - -jobs: - build-android-adhoc: - runs-on: ubuntu-latest - name: "Build iOS app" - - strategy: - matrix: - node-version: [16.x] - - steps: - - name: Getting the repo - uses: actions/checkout@v2 - - # Install node - - name: Installing node - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - # Install React Native CLI, used to bundle the app - - name: Install React Native CLI - run: | - yarn global add react-native-cli - - # Install Yarn dependencies - - name: Install Yarn dependencies - run: | - yarn install - - - name: Make envfile Acceptation - if: github.ref == 'refs/heads/main' - uses: SpicyPizza/create-envfile@v1.3 - with: - envkey_ENDPOINT_TO_ENFORCE: ${{ secrets.ACC_ENDPOINT_TO_ENFORCE }} - envkey_API_KEY: ${{ secrets.ACC_API_KEY }} - envkey_RADAR_PUBLISHABLE_KEY: ${{ secrets.RADAR_PUBLISHABLE_KEY }} - - - name: Make envfile Development - if: github.ref != 'refs/heads/main' - uses: SpicyPizza/create-envfile@v1.3 - with: - envkey_ENDPOINT_TO_ENFORCE: ${{ secrets.DEV_ENDPOINT_TO_ENFORCE }} - envkey_API_KEY: ${{ secrets.DEV_API_KEY }} - envkey_RADAR_PUBLISHABLE_KEY: ${{ secrets.RADAR_PUBLISHABLE_KEY }} - - # Build iOS app - - uses: sparkfabrik/ios-build-action@v1.2.0 - name: Build iOS - with: - project-path: ./ios/ProjectAccessibility.xcodeproj - p12-base64: ${{ secrets.P12_BASE64 }} - mobileprovision-base64: ${{ secrets.MOBILEPROVISION_BASE64 }} - code-signing-identity: ${{ secrets.CODE_SIGNING_IDENTITY }} - team-id: ${{ secrets.TEAM_ID }} - workspace-path: ProjectAccessibility.xcworkspace # optional \ No newline at end of file From 8bbc5168e9c9d9657ac7b55f9b8bc3504190ce84 Mon Sep 17 00:00:00 2001 From: Jaap Date: Thu, 9 Jun 2022 11:23:57 +0200 Subject: [PATCH 10/14] Locatie plist --- ios/ProjectAccessibility/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/ProjectAccessibility/Info.plist b/ios/ProjectAccessibility/Info.plist index 36bcadd..33fefa1 100644 --- a/ios/ProjectAccessibility/Info.plist +++ b/ios/ProjectAccessibility/Info.plist @@ -38,9 +38,9 @@ NSCameraUsageDescription De camera wordt gebruikt om een volledig antwoord op de vraag te kunnen geven. NSLocationAlwaysAndWhenInUseUsageDescription - $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling. + De locatie wordt gebruikt om zo de dichtsbijzijnde onderdelen te kunnen tonen in de vragenlijst. NSLocationAlwaysUsageDescription - $(PRODUCT_NAME) wilt graag locatie gebruiken voor locatiebepaling. + De locatie wordt gebruikt om zo de dichtsbijzijnde onderdelen te kunnen tonen in de vragenlijst. NSLocationWhenInUseUsageDescription NSMicrophoneUsageDescription From 6892fd2144e7ecf3cbb41a0c6050074a683169c2 Mon Sep 17 00:00:00 2001 From: Jaap Date: Fri, 10 Jun 2022 09:55:28 +0200 Subject: [PATCH 11/14] Test script --- .github/scripts/import-certificate.sh | 15 ++++++ .github/scripts/import-profile.sh | 6 +++ .github/scripts/set-env-from-xcodeproj.sh | 7 +++ .github/workflows/ios-appstore.yml | 65 +++++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 .github/scripts/import-certificate.sh create mode 100644 .github/scripts/import-profile.sh create mode 100644 .github/scripts/set-env-from-xcodeproj.sh create mode 100644 .github/workflows/ios-appstore.yml diff --git a/.github/scripts/import-certificate.sh b/.github/scripts/import-certificate.sh new file mode 100644 index 0000000..4525860 --- /dev/null +++ b/.github/scripts/import-certificate.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -euo pipefail + +security create-keychain -p "" build.keychain +security list-keychains -s build.keychain +security default-keychain -s build.keychain +security unlock-keychain -p "" build.keychain +security set-keychain-settings +security import <(echo $SIGNING_CERTIFICATE_P12_DATA | base64 --decode) \ + -f pkcs12 \ + -k build.keychain \ + -P $SIGNING_CERTIFICATE_PASSWORD \ + -T /usr/bin/codesign +security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain diff --git a/.github/scripts/import-profile.sh b/.github/scripts/import-profile.sh new file mode 100644 index 0000000..1267d71 --- /dev/null +++ b/.github/scripts/import-profile.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -euo pipefail + +mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles +echo "$PROVISIONING_PROFILE_DATA" | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/profile.mobileprovision diff --git a/.github/scripts/set-env-from-xcodeproj.sh b/.github/scripts/set-env-from-xcodeproj.sh new file mode 100644 index 0000000..78f9ce7 --- /dev/null +++ b/.github/scripts/set-env-from-xcodeproj.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -euo pipefail + +SCHEME="$(xcodebuild -list -json | jq -r '.project.schemes[0]')" +PRODUCT_NAME="$(xcodebuild -scheme "$SCHEME" -showBuildSettings | grep " PRODUCT_NAME " | sed "s/[ ]*PRODUCT_NAME = //")" +echo "::set-env name=PRODUCT_NAME::$PRODUCT_NAME" diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml new file mode 100644 index 0000000..ee88546 --- /dev/null +++ b/.github/workflows/ios-appstore.yml @@ -0,0 +1,65 @@ +name: deploy + +on: + push: + branches: + - main + - develop + pull_request: + +jobs: + deploy: + runs-on: macos-latest + + steps: + - name: Checkout project + uses: actions/checkout@v2 + + - name: Open ios folder + run: | + cd ios + + - name: Set environment variables from project settings + run: | + exec .github/scripts/set-env-from-xcodeproj.sh + + - name: Import signing certificate + env: + SIGNING_CERTIFICATE_P12_DATA: ${{ secrets.P12_BASE64 }} + SIGNING_CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} + run: | + exec .github/scripts/import-certificate.sh + + - name: Import provisioning profile + env: + PROVISIONING_PROFILE_DATA: ${{ secrets.MOBILEPROVISION_BASE64 }} + run: | + exec .github/scripts/import-profile.sh + + - name: Build app + run: | + fastlane run build_app + + - name: Upload build artifacts + uses: actions/upload-artifact@v2 + with: + name: build.log + path: ~/Library/Logs/gym/*.log + + - name: Upload release assets + if: startsWith(github.ref, 'refs/tags/v') + uses: softprops/action-gh-release@v1 + with: + files: | + ${{ env.PRODUCT_NAME }}.ipa + ${{ env.PRODUCT_NAME }}.app.dSYM.zip + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload app to App Store Connect + if: startsWith(github.ref, 'refs/tags/v') + env: + APP_STORE_CONNECT_USERNAME: ${{ secrets.APP_STORE_CONNECT_USERNAME }} + APP_STORE_CONNECT_PASSWORD: ${{ secrets.APP_STORE_CONNECT_PASSWORD }} + run: | + xcrun altool --upload-app -t ios -f "$PRODUCT_NAME.ipa" -u "$APP_STORE_CONNECT_USERNAME" -p "$APP_STORE_CONNECT_PASSWORD" From dbc6a51534010d568177a3163e225ec4beeeb8c3 Mon Sep 17 00:00:00 2001 From: Jaap Date: Fri, 10 Jun 2022 09:56:17 +0200 Subject: [PATCH 12/14] name update --- .github/workflows/ios-appstore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml index ee88546..6f9d543 100644 --- a/.github/workflows/ios-appstore.yml +++ b/.github/workflows/ios-appstore.yml @@ -1,4 +1,4 @@ -name: deploy +name: Build iOS App and Deploy on: push: From 402524abb54e1634d5f524976fb86f88b9f658ee Mon Sep 17 00:00:00 2001 From: Jaap Date: Fri, 10 Jun 2022 09:57:08 +0200 Subject: [PATCH 13/14] Script chmod --- .github/workflows/ios-appstore.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml index 6f9d543..2e08457 100644 --- a/.github/workflows/ios-appstore.yml +++ b/.github/workflows/ios-appstore.yml @@ -15,6 +15,10 @@ jobs: - name: Checkout project uses: actions/checkout@v2 + - name: CHMOD +x scripts + run: | + chmod +x scripts/*.sh + - name: Open ios folder run: | cd ios From 1ff9bb7959e99b93353833cc8a282c3010a5b206 Mon Sep 17 00:00:00 2001 From: Jaap Date: Fri, 10 Jun 2022 09:59:28 +0200 Subject: [PATCH 14/14] Fix dir --- .github/workflows/ios-appstore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-appstore.yml b/.github/workflows/ios-appstore.yml index 2e08457..aa5ee41 100644 --- a/.github/workflows/ios-appstore.yml +++ b/.github/workflows/ios-appstore.yml @@ -17,7 +17,7 @@ jobs: - name: CHMOD +x scripts run: | - chmod +x scripts/*.sh + chmod +x .github/scripts/*.sh - name: Open ios folder run: |