fix build run

renefloor · renefloor · commit 9feaf651ce90 · 2025-03-04T13:56:48.000+01:00
diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml
@@ -2,14 +2,31 @@ name: build_nightly
 
 on:
   push:
-    branches:
-      - develop
+#    branches:
+#      - develop
   workflow_dispatch:
+    inputs:
+      build_ios:
+        type: boolean
+        description: iOS
+        default: true
+      build_android:
+        type: boolean
+        description: Android
+        default: true
+      build_web:
+        type: boolean
+        description: Web
+        default: true
 
 defaults:
   run:
     working-directory: sample_app
 
+env:
+  FLUTTER_VERSION: "3.29.0"
+  FLUTTER_CHANNEL: stable
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -18,14 +35,22 @@ jobs:
   build_and_deploy_ios:
     runs-on: macos-latest
     timeout-minutes: 40
+    if: ${{ github.event_name == 'push' || inputs.build_ios == true }}
+#    if: false
     steps:
+      - name: Install Bot SSH Key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
+
       - name: Checkout code
         uses: actions/checkout@v3
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: stable
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
           cache: true
 
       - name: Setup Ruby and Gems
@@ -39,13 +64,13 @@ jobs:
 
       - name: Copy google service account
         run: |
-          echo "${{ secrets.SAMPLE_FIREBASE_UPLOAD_CREDENTIALS }}" > ${{GITHUB_WORKSPACE}}/firebase-service-account.json
+          echo "${{ secrets.SAMPLE_FIREBASE_UPLOAD_CREDENTIALS }}" | base64 --decode | jq > ${{ github.workspace }}/sample_app/ios/firebase-service-account.json
 
       - name: Build and release
         env:
+          GOOGLE_APPLICATION_CREDENTIALS: "${{ github.workspace }}/sample_app/ios/firebase-service-account.json"
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
-          GOOGLE_APPLICATION_CREDENTIALS: ${{GITHUB_WORKSPACE}}/firebase-service-account.json
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
         run: |
           flutter build ios --no-codesign
           cd ios
@@ -54,42 +79,56 @@ jobs:
   build_and_deploy_android:
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    if: ${{ github.event_name == 'push' || inputs.build_android == true }}
     steps:
+      - name: Install Bot SSH Key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
+
       - name: Checkout code
         uses: actions/checkout@v3
 
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: '12.x'
+          distribution: "zulu"
+          java-version: "17"
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: stable
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
           cache: true
 
       - name: Build
         run: flutter build apk
 
+      - name: Copy google service account
+        run: |
+          echo "${{ secrets.SAMPLE_FIREBASE_UPLOAD_CREDENTIALS }}" | base64 --decode | jq > ${{ github.workspace }}/sample_app/android/firebase-service-account.json
+
       - name: Deploy
         uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
           appId: ${{secrets.SAMPLE_FIREBASE_ANDROID_APPID}}
-          serviceCredentialsFileContent: ${{secrets.SAMPLE_FIREBASE_UPLOAD_CREDENTIALS}}
+          serviceCredentialsFile: "${{ github.workspace }}/sample_app/android/firebase-service-account.json"
           groups: stream-testers
           debug: true
-          file: sample_app/build/app/outputs/apk/release/app-release.apk
+          file: build/app/outputs/flutter-apk/app-release.apk
 
       - name: Upload APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-stream-chat-v1
-          path: sample_app/build/app/outputs/apk/release/app-release.apk
+          path: build/app/outputs/flutter-apk/app-release.apk
 
   build_and_deploy_web:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+#    if: ${{ github.event_name == 'push' || inputs.build_web == true }}
+    if: false
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -103,14 +142,14 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: stable
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
           cache: true
-          flutter-version: 3.29.0
 
       - name: Build and Deploy
-        uses: bluefireteam/flutter-gh-pages@v7
+        uses: bluefireteam/flutter-gh-pages@v9
         with:
-          baseHref: /flutter-samples/
+          baseHref: /stream-chat-flutter/
           workingDir: sample_app
 
 
diff --git a/sample_app/android/app/build.gradle b/sample_app/android/app/build.gradle
@@ -42,7 +42,7 @@ android {
     defaultConfig {
         applicationId "io.getstream.chat.android.flutter.sample"
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
diff --git a/sample_app/android/build.gradle b/sample_app/android/build.gradle
@@ -16,6 +16,9 @@ subprojects {
             def packageName = manifest.@package.text()
             android.namespace= packageName
         }
+        if (project.hasProperty('android')) {
+            project.android { compileSdkVersion 35 }
+        }
     }
 
 }
@@ -25,4 +28,4 @@ subprojects {
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/sample_app/android/gradle.properties b/sample_app/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2g
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/sample_app/ios/fastlane/Fastfile b/sample_app/ios/fastlane/Fastfile
@@ -1,4 +1,4 @@
-fastlane_version "2.195.0"
+fastlane_version "2.226.0"
 default_platform :ios
 
 before_all do
@@ -10,6 +10,7 @@ end
 desc "Installs all Certs and Profiles necessary for development and ad-hoc"
 lane :match_me do
   match(
+    api_key: appstore_api_key,
     type: "adhoc",
     app_identifier: [
         "io.getstream.flutter",
@@ -22,6 +23,7 @@ end
 desc "Installs all Certs and Profiles necessary for appstore"
 lane :match_appstore do
   match(
+    api_key: appstore_api_key,
     type: "appstore",
     app_identifier: [
         "io.getstream.flutter",
@@ -30,61 +32,66 @@ lane :match_appstore do
   )
 end
 
-platform :ios do
-    desc "Deploy build to Firebase"
-    lane :deploy_to_firebase do
-        match_me
-       
-        gym(
-            workspace: "./Runner.xcworkspace",
-            scheme: "Runner",
-            export_method: "ad-hoc",
-            export_options: "./fastlane/beta_gym_export_options.plist",
-            silent: true,
-            clean: true,
-            include_symbols: true,
-            output_directory: "./dist"
-        )
+lane :deploy_to_firebase do
+    match_me
 
-        message = changelog_from_git_commits(commits_count: 10)
+    gym(
+        workspace: "./Runner.xcworkspace",
+        scheme: "Runner",
+        export_method: "ad-hoc",
+        export_options: "./fastlane/beta_gym_export_options.plist",
+        silent: true,
+        clean: true,
+        include_symbols: true,
+        output_directory: "./dist"
+    )
 
-        firebase_app_distribution(
-            app: "1:674907137625:ios:cafb9fb076a453c4d7f348",
-            groups: "ios-stream-testers"
-        )
-    end
+    message = changelog_from_git_commits(commits_count: 10)
+
+    firebase_app_distribution(
+        app: "1:674907137625:ios:cafb9fb076a453c4d7f348",
+        groups: "ios-stream-testers"
+    )
 end
 
-platform :ios do
-    desc "Deploy build to TestFlight"
-    lane :deploy_to_testflight do
-        match_appstore
+lane :deploy_to_testflight do
+    match_appstore
+
+    settings_to_override = {
+      :BUNDLE_IDENTIFIER => "io.getstream.flutter",
+      :PROVISIONING_PROFILE_SPECIFIER => "match AppStore io.getstream.flutter 1651569762"
+    }
 
-        settings_to_override = {
-          :BUNDLE_IDENTIFIER => "io.getstream.flutter",
-          :PROVISIONING_PROFILE_SPECIFIER => "match AppStore io.getstream.flutter 1651569762"
-        }
+    gym(
+        workspace: "./Runner.xcworkspace",
+        scheme: "Runner",
+        export_method: "app-store",
+        export_options: "./fastlane/testflight_gym_export_options.plist",
+        silent: true,
+        clean: true,
+        xcargs: settings_to_override,
+        include_symbols: true,
+        output_directory: "./dist",
+    )
 
-        gym(
-            workspace: "./Runner.xcworkspace",
-            scheme: "Runner",
-            export_method: "app-store",
-            export_options: "./fastlane/testflight_gym_export_options.plist",
-            silent: true,
-            clean: true,
-            xcargs: settings_to_override,
-            include_symbols: true,
-            output_directory: "./dist",
-        )
+    message = changelog_from_git_commits(commits_count: 10)
+
+    upload_to_testflight(
+        api_key: appstore_api_key,
+        groups: ['Public'],
+        distribute_external: true,
+        changelog: message,
+        username: 'salvatore@getstream.io',
+        reject_build_waiting_for_review: true
+    )
+end
 
-        message = changelog_from_git_commits(commits_count: 10)
 
-        upload_to_testflight(
-            groups: ['Public'],
-            distribute_external: true,
-            changelog: message,
-            username: 'salvatore@getstream.io',
-            reject_build_waiting_for_review: true
-        )
-    end
+private_lane :appstore_api_key do
+@appstore_api_key ||= app_store_connect_api_key(
+  key_id: 'MT3PRT8TB7',
+  issuer_id: '69a6de96-0738-47e3-e053-5b8c7c11a4d1',
+  key_content: ENV.fetch('APPSTORE_API_KEY', nil),
+  in_house: false
+)
 end

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ subprojects {`
`16`	`16`	`def packageName = manifest.@package.text()`
`17`	`17`	`android.namespace= packageName`
`18`	`18`	`}`
	`19`	`+ if (project.hasProperty('android')) {`
	`20`	`+ project.android { compileSdkVersion 35 }`
	`21`	`+ }`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`}`
`@@ -25,4 +28,4 @@ subprojects {`
`25`	`28`
`26`	`29`	`tasks.register("clean", Delete) {`
`27`	`30`	`delete rootProject.buildDir`
`28`		`-}`
	`31`	`+}`