fixes

wildlifeai · Dec 25, 2023 · 2195457 · 2195457
1 parent ddc718d
commit 2195457
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 61 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,6 +24,10 @@ jobs:
           name: 'wildlife-watcher-service-account.json'
           json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
           dir: './fastlane'
+      - name: Copy Provisioning certificate
+        run: echo -n "${{ secrets.IOS_GOOGLE_SERVICES_PLIST }}" | base64 --decode > ./fastlane/profile.mobileprovision
+      - name: Copy private key
+        run: echo -n "${{ secrets.IOS_GOOGLE_SERVICES_PLIST }}" | base64 --decode > ./fastlane/cert.p12
       - name: Copy Google Services plist file
         run: echo -n "${{ secrets.IOS_GOOGLE_SERVICES_PLIST }}" | base64 --decode > ./ios/GoogleService-Info.plist
       - name: Install npm dependency
@@ -40,52 +44,52 @@ jobs:
       - name: Run fastlane
         run: |
           bundle exec fastlane ios build_debug
-  android-build:
-    environment: development
-    name: Android development build
-    runs-on: ubuntu-latest
-    container:
-      image: reactnativecommunity/react-native-android
-    steps:
-      - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.9.1
-      - name: Checkout repo from dev branch
-        uses: actions/checkout@v3
-        with:
-          ref: initial
-      - name: create-json
-        id: add-firebase-credentials
-        uses: jsdaniell/create-json@v1.2.2
-        with:
-          name: 'wildlife-watcher-service-account.json'
-          json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
-          dir: './fastlane'
-      - name: create-json
-        id: add-android-credentials
-        uses: jsdaniell/create-json@v1.2.2
-        with:
-          name: 'google-services.json'
-          json: ${{ secrets.ANDROID_GOOGLE_SERVICES_JSON }}
-          dir: './android/app'
-      - name: Install npm dependency
-        run: npm install
-      - name: Install bundler
-        run: |
-          gem install bundler -v 2.4.10
-      - name: Install gem plugins
-        run: |
-          bundle install
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Run fastlane
-        run: |
-          bundle exec fastlane android build_debug
-        env:
-          APP_ID: ${{ secrets.APP_ID }}
-          ANDROID_ARTEFACT_PATH: ${{ secrets.ANDROID_ARTEFACT_PATH }}
+  # android-build:
+  #   environment: development
+  #   name: Android development build
+  #   runs-on: ubuntu-latest
+  #   container:
+  #     image: reactnativecommunity/react-native-android
+  #   steps:
+  #     - name: Cancel previous runs
+  #       uses: styfle/cancel-workflow-action@0.9.1
+  #     - name: Checkout repo from dev branch
+  #       uses: actions/checkout@v3
+  #       with:
+  #         ref: initial
+  #     - name: create-json
+  #       id: add-firebase-credentials
+  #       uses: jsdaniell/create-json@v1.2.2
+  #       with:
+  #         name: 'wildlife-watcher-service-account.json'
+  #         json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
+  #         dir: './fastlane'
+  #     - name: create-json
+  #       id: add-android-credentials
+  #       uses: jsdaniell/create-json@v1.2.2
+  #       with:
+  #         name: 'google-services.json'
+  #         json: ${{ secrets.ANDROID_GOOGLE_SERVICES_JSON }}
+  #         dir: './android/app'
+  #     - name: Install npm dependency
+  #       run: npm install
+  #     - name: Install bundler
+  #       run: |
+  #         gem install bundler -v 2.4.10
+  #     - name: Install gem plugins
+  #       run: |
+  #         bundle install
+  #     - uses: actions/cache@v3
+  #       with:
+  #         path: |
+  #           ~/.gradle/caches
+  #           ~/.gradle/wrapper
+  #         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-gradle-
+  #     - name: Run fastlane
+  #       run: |
+  #         bundle exec fastlane android build_debug
+  #       env:
+  #         APP_ID: ${{ secrets.APP_ID }}
+  #         ANDROID_ARTEFACT_PATH: ${{ secrets.ANDROID_ARTEFACT_PATH }}
diff --git a/cert.mobileprovision b/cert.mobileprovision
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -16,6 +16,12 @@
 platform :ios do
   desc "Build a debug version of the app"
   lane :build_debug do
+    install_provisioning_profile(path: "./fastlane/profile.mobileprovision")
+    import_certificate(
+      certificate_path: "./fastlane/cert.p12",
+      certificate_password: ENV["CERTIFICATE_PASSWORD"] || "default"
+    )
+
     build_ios_app(
       silent: true,
       scheme: 'WildlifeWatcher', 

diff --git a/ios/WildlifeWatcher.xcodeproj/project.pbxproj b/ios/WildlifeWatcher.xcodeproj/project.pbxproj
@@ -299,8 +299,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.WildlifeWatcher;
+				PRODUCT_BUNDLE_IDENTIFIER = com.WildlifeWatcher;
 				PRODUCT_NAME = WildlifeWatcher;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -327,8 +326,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.WildlifeWatcher;
+				PRODUCT_BUNDLE_IDENTIFIER = com.WildlifeWatcher;
 				PRODUCT_NAME = WildlifeWatcher;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -415,10 +413,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -497,10 +492,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

diff --git a/pkey.txt b/pkey.txt
@@ -0,0 +1 @@
+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