Merge pull request #57 from wednesday-solutions/main

Release sync
wednesday-solutions · Apr 9, 2024 · 332b5b4 · 332b5b4
2 parents 89b81b5 + 3d08aad
commit 332b5b4
Show file tree

Hide file tree

Showing 76 changed files with 614 additions and 595 deletions.
diff --git a/.env.dev b/.env.dev
@@ -1,2 +1,4 @@
 OPEN_WEATHER_API_KEY=YOUR_API_KEY
-OPEN_WEATHER_BASE_URL=https://api.openweathermap.org/
+OPEN_WEATHER_BASE_URL=https://api.openweathermap.org/
+SHOW_LOGS=true
+LOG_SQL=true
diff --git a/.env.qa b/.env.qa
@@ -1,2 +1,4 @@
 OPEN_WEATHER_API_KEY=YOUR_API_KEY
-OPEN_WEATHER_BASE_URL=https://api.openweathermap.org/
+OPEN_WEATHER_BASE_URL=https://api.openweathermap.org/
+SHOW_LOGS=true
+LOG_SQL=true
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -2,7 +2,7 @@ name: CD
 on:
   push:
     branches:
-      - main
+      - release
   workflow_dispatch:
 
 jobs:
@@ -17,10 +17,17 @@ jobs:
         with:
           token: ${{ secrets.SHOUNAK_GITHUB_TOKEN }}
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
           cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
 
       - name: Setup .env.qa
         env:
@@ -41,9 +48,6 @@ jobs:
       - name: Run build_runner
         run: derry build_runner
 
-      - name: Bump Build Number
-        run: scripts/bump-build-number.sh
-
       - name: Decode Keystore
         id: decode_keystore
         uses: timheuer/base64-to-file@v1
@@ -88,85 +92,83 @@ jobs:
     name: Release iOS to TestFlight
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.SHOUNAK_GITHUB_TOKEN }}
-
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          cache: true
-
-      - name: Setup .env.qa
-        env:
-          ENV_FILE: ${{ secrets.ENV_QA }}
-        run: echo -n $ENV_FILE | base64 --decode > .env.qa
-
-      - name: Setup .env.prod
-        env:
-          ENV_FILE: ${{ secrets.ENV_PROD }}
-        run: echo -n $ENV_FILE | base64 --decode > .env.prod
-
-      - name: Activate derry
-        run: flutter pub global activate derry
-
-      - name: Get Dependencies
-        run: flutter pub get
-
-      - name: Run build_runner
-        run: derry build_runner
-
-      - uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: latest-stable
-
-      - name: Bump Build Number
-        run: scripts/bump-build-number.sh
-
-      - name: Install the Apple certificate and provisioning profile
-        env:
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: chmod u+x scripts/install_certs.sh && scripts/install_certs.sh
-
-      - name: Retrieve Export-Options.plist from secrets
-        env:
-          PLIST: ${{ secrets.IOS_PLIST }}
-          PLIST_PATH: ${{ runner.temp }}/options.plist
-        run: echo -n "$PLIST" | base64 --decode --output $PLIST_PATH
-
-      - name: Build the signed ipa
-        # TODO: Move to derry
-        run: chmod u+x scripts/build.sh && scripts/build.sh ipa prod --release
-
-      - name: Upload the signed ipa to TestFlight
-        env:
-          PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
-          IPA_PATH: build/ios/ipa/prod.ipa
-        run: xcrun altool --upload-app --file $IPA_PATH --username "ios@wednesday.is" --password $PASSWORD --type ios --verbose
+      - name: iOS build disabled
+        run: echo Uncomment "build-ios" job to build and deploy ios app.
+
+#      - uses: actions/checkout@v3
+#        with:
+#          token: ${{ secrets.SHOUNAK_GITHUB_TOKEN }}
+#
+#      - uses: subosito/flutter-action@v2
+#        with:
+#          channel: 'stable'
+#          cache: true
+#
+#      - name: Setup .env.qa
+#        env:
+#          ENV_FILE: ${{ secrets.ENV_QA }}
+#        run: echo -n $ENV_FILE | base64 --decode > .env.qa
+#
+#      - name: Setup .env.prod
+#        env:
+#          ENV_FILE: ${{ secrets.ENV_PROD }}
+#        run: echo -n $ENV_FILE | base64 --decode > .env.prod
+#
+#      - name: Activate derry
+#        run: flutter pub global activate derry
+#
+#      - name: Get Dependencies
+#        run: flutter pub get
+#
+#      - name: Run build_runner
+#        run: derry build_runner
+#
+#      - uses: maxim-lobanov/setup-xcode@v1
+#        with:
+#          xcode-version: latest-stable
+#
+#      - name: Install the Apple certificate and provisioning profile
+#        env:
+#          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+#          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+#          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+#          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+#        run: chmod u+x scripts/install_certs.sh && scripts/install_certs.sh
+#
+#      - name: Retrieve Export-Options.plist from secrets
+#        env:
+#          PLIST: ${{ secrets.IOS_PLIST }}
+#          PLIST_PATH: ${{ runner.temp }}/options.plist
+#        run: echo -n "$PLIST" | base64 --decode --output $PLIST_PATH
+#
+#      - name: Build the signed ipa
+#        # TODO: Move to derry
+#        run: chmod u+x scripts/build.sh && scripts/build.sh ipa prod --release
+#
+#      - name: Upload the signed ipa to TestFlight
+#        env:
+#          PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
+#          IPA_PATH: build/ios/ipa/prod.ipa
+#        run: xcrun altool --upload-app --file $IPA_PATH --username "ios@wednesday.is" --password $PASSWORD --type ios --verbose
 
   commit-version-update:
-    name: Commit Version Change
-    runs-on: ubuntu-latest
-    needs: [ build-android, build-ios ]
-    if: |
-      always() &&
-      (needs.build-android.result == 'success' || needs.build-ios.result == 'success')
-    steps:
-      - uses: actions/checkout@v3
-        # Replace with your Personal Access Token
-        with:
-          token: ${{ secrets.SHOUNAK_GITHUB_TOKEN }}
-
-      - name: Bump Version
-        run: scripts/bump-build-number.sh
-
-      - name: Configure Git
-        run: |
-          git config user.name "Github Actions CD"
-          git config user.email "<>"
+      name: Commit Version Change
+      runs-on: ubuntu-latest
+      needs: [ build-android, build-ios ]
+      steps:
+        - uses: actions/checkout@v3
+          # Replace with your Personal Access Token
+          with:
+            token: ${{ secrets.SHOUNAK_GITHUB_TOKEN }}
+
+        - name: Bump Version
+          run: scripts/bump-build-number.sh
+
+        - name: Configure Git
+          run: |
+            git config user.name "Github Actions CD"
+            git config user.email "<>"
+
+        - name: Commit Version Change
+          run: scripts/commit-version.sh
 
-      - name: Commit Version Change
-        run: scripts/commit-version.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
 
       - name: Setup .env.dev
         env:
@@ -54,10 +56,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
           cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
 
       - name: Setup .env.dev
         env:
@@ -88,6 +97,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
 
       - name: Setup .env.dev
         env:
@@ -140,6 +151,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
 
       - name: Setup .env.dev
         env:

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -0,0 +1,62 @@
+name: E2E
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  e2e:
+    name: E2E
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+
+      - name: Setup .env.qa
+        env:
+          ENV_FILE: ${{ secrets.ENV_QA }}
+        run: echo -n $ENV_FILE | base64 --decode > .env.qa
+
+      - name: Activate derry
+        run: dart pub global activate derry
+
+      - name: Get Dependencies
+        run: flutter pub get
+
+      - name: Run build_runner
+        run: derry build_runner
+
+      - name: Activate patrol
+        run: dart pub global activate patrol_cli
+
+      - name: Setup android
+        run: flutter build apk --config-only
+
+      - name: Generate Test apks
+        run: patrol build android --flavor=qa --dart-define=flavor=qa --verbose
+
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v1'
+        with:
+          credentials_json: '${{ secrets.GOOGLE_CLOUD_TEST_LAB_CREDS }}'
+
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v1'
+
+      - name: Firebase Test Lab
+        run: gcloud firebase test android run --type instrumentation --app ./build/app/outputs/apk/qa/debug/app-qa-debug.apk --test ./build/app/outputs/apk/androidTest/qa/debug/app-qa-debug-androidTest.apk --device model=panther,version=33 --environment-variables clearPackageData=true --use-orchestrator
+
diff --git a/.github/workflows/update_goldens.yml b/.github/workflows/update_goldens.yml
@@ -13,6 +13,8 @@ jobs:
         with:
           channel: 'stable'
           cache: true
+          cache-key: "flutterCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-key: "flutterPubCacheV1-:os:-:channel:-:version:-:arch:-:hash:"
 
       - name: Setup .env.dev
         env:

diff --git a/README.md b/README.md
@@ -227,6 +227,7 @@ The template also includes a testing setup for
 - [`Unit Tests`](test/repository).
 - [`Widget Tests`](test/presentation/integration)
 - [`Golden Tests`](test/presentation/goldens)
+- [`Integration / E2E tests`](integration_test) using [Patrol](https://patrol.leancode.co/)
 
 The test coverage and code quality reporting is done using [`sonarqube`](https://docs.sonarqube.org/latest/).
 You can read the documentation about integrating `sonarqube` in you CI workflow [here](https://docs.sonarqube.org/latest/devops-platform-integration/github-integration/#analyzing-projects-with-github-actions).

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +22,9 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace "com.wednesday.flutter_template"
     compileSdkVersion project.properties['flutter.compileSdkVersion'].toInteger()
 
     compileOptions {
@@ -111,7 +110,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23"
 
     implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
 

diff --git a/android/app/src/androidTest/java/MainActivityTest.java b/android/app/src/androidTest/java/MainActivityTest.java
@@ -1,6 +1,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.example.flutter_template.MainActivity;
+import com.wednesday.flutter_template
+.MainActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;