FIX: API key process

wip

wip

wip

wip

Update Fastfile

Update build-release-testflight-ipa.yml

Update Fastfile

wip

Update Fastfile

Update project.pbxproj

Update Fastfile

wip

Update Fastfile

Update Fastfile

Update Fastfile

wip

Update build-release-testflight-ipa.yml

.github/workflows/build-release-testflight-ipa.yml

@@ -46,26 +46,8 @@ jobs:
 
       - name: Install CocoaPods
         run: sudo gem install cocoapods
-
-      - name: Use npm caches
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
-
-
-      # Very slow.
-      # - name: Use node_modules caches
-      #   id: cache-nm
-      #   uses: actions/cache@v2
-      #   with:
-      #     path: node_modules
-      #     key: ${{ runner.os }}-nm-${{ hashFiles('package-lock.json') }}
-
+  
       - name: Install node_modules
-        if: steps.cache-nm.outputs.cache-hit != 'true'
         run: npm install
 
       - name: Set up Git Authentication
@@ -108,13 +90,8 @@ jobs:
         run: bundle exec fastlane ios build_app_lane
         working-directory: ./ios
 
-      - name: Decode and Save API Key
-        env:
-          APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}
-        run: |
-          echo -n "${APP_STORE_CONNECT_API_KEY_CONTENT}" | base64 -d > ios/appstore_api_key.p8
-          export APP_STORE_CONNECT_API_KEY_PATH=$(pwd)/ios/appstore_api_key.p8
-          echo $APP_STORE_CONNECT_API_KEY_PATH
+      - name: Create App Store Connect API Key JSON
+        run: echo '${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}' > ./ios/appstore_api_key.json
 
       - name: Upload to TestFlight
         env: 
@@ -130,9 +107,15 @@ jobs:
         run: bundle exec fastlane ios upload_to_testflight_lane
         working-directory: ./ios
 
-      - name: Clean Build Artifacts
-        run: bundle exec fastlane ios clean_build_artifacts_lane
-        working-directory: ./ios
+      - name: Read IPA Output Name
+        id: ipa_name
+        run: echo "::set-output name=ipa_output_name::$(cat output_name.txt)"
+
+      - name: Upload IPA as Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.ipa_name.outputs.ipa_output_name }}
+          path: ./build/${{ steps.ipa_name.outputs.ipa_output_name }}
 
       - name: Upload Fastlane logs as Artifact
         if: always()

ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,23 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "efqrcode",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/EFPrefix/EFQRCode.git",
-      "state" : {
-        "revision" : "2991c2f318ad9529d93b2a73a382a3f9c72c64ce",
-        "version" : "6.2.2"
-      }
-    },
-    {
-      "identity" : "swift_qrcodejs",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/ApolloZhu/swift_qrcodejs.git",
-      "state" : {
-        "revision" : "374dc7f7b9e76c6aeb393f6a84590c6d387e1ecb",
-        "version" : "2.2.2"
-      }
-    }
-  ],
-  "version" : 2
-}

ios/fastlane/Fastfile

@@ -50,8 +50,18 @@ platform :ios do
 
   desc "Increment build number"
   lane :increment_build_number_lane do
-    UI.message("Incrementing build number...")
-    increment_build_number(xcodeproj: "BlueWallet.xcodeproj")
+    UI.message("Incrementing build number to current timestamp...")
+  
+    # Get current Unix timestamp
+    @new_build_number = Time.now.to_i.to_s
+  
+    # Set the new build number
+    increment_build_number(
+      xcodeproj: "BlueWallet.xcodeproj", 
+      build_number: @new_build_number
+    )
+  
+    UI.message("Build number set to: #{@new_build_number}")
   end
 
   desc "Install CocoaPods dependencies"
@@ -83,7 +93,8 @@ platform :ios do
         }
       },
       xcargs: "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) VERBOSE_LOGGING=1'",
-      output_directory: "./build_output",
+      output_directory: "./build", # Directory where the IPA file will be stored
+      output_name: "BlueWallet_#{@new_build_number}.ipa", # Using the build number in the file name
       buildlog_path: "./build_logs"
     )
   end
@@ -91,18 +102,7 @@ platform :ios do
   desc "Upload to TestFlight"
   lane :upload_to_testflight_lane do
     UI.message("Uploading to TestFlight...")
-    api_key = app_store_connect_api_key(
-      key_id: ENV["APP_STORE_CONNECT_API_KEY_KEY_ID"],
-      issuer_id: ENV["APP_STORE_CONNECT_API_KEY_ISSUER_ID"],
-      key_filepath: "./appstore_api_key.p8"
-    )
-    upload_to_testflight(api_key: api_key, skip_waiting_for_build_processing: true)
-  end
-
-  desc "Clean up build artifacts"
-  lane :clean_build_artifacts_lane do
-    UI.message("Cleaning up build artifacts...")
-    clean_build_artifacts
+    upload_to_testflight(api_key_path: "appstore_api_key.json", ipa: "./build/BlueWallet_#{@new_build_number}.ipa", skip_waiting_for_build_processing: true)
   end
 
   desc "Deploy to TestFlight"
@@ -123,7 +123,6 @@ platform :ios do
 
     build_app_lane
     upload_to_testflight_lane
-    clean_build_artifacts_lane
 
     # Clean up and delete the temporary keychain
     delete_keychain(name: "temp_keychain")
@@ -132,5 +131,7 @@ platform :ios do
     last_commit = last_git_commit
     already_built_flag = ".already_built_#{last_commit[:sha]}"
     File.write(already_built_flag, Time.now.to_s)
+    File.write("output_name.txt", "BlueWallet_#{@new_build_number}.ipa")
   end
+
 end