Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/staging' into Daniel-Net
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielmarv
danielmarv committed Jan 30, 2025
2 parents cc432de + c06dcca commit 91afbf1
Show file tree
Hide file tree
Showing 118 changed files with 3,767 additions and 2,821 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-frontend-pr-previews.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ jobs:
echo "includes:" >> app.yaml
echo " - .env.yaml" >> app.yaml
echo "automatic_scaling:" >> app.yaml
echo " cool_down_period: 120s" >> app.yaml
echo " cool_down_period_sec: 120" >> app.yaml
echo " min_num_instances: 1" >> app.yaml
echo " max_num_instances: 3" >> app.yaml
echo " cpu_utilization:" >> app.yaml
Expand Down Expand Up @@ -653,7 +653,7 @@ jobs:
echo "includes:" >> app.yaml
echo " - .env.yaml" >> app.yaml
echo "automatic_scaling:" >> app.yaml
echo " cool_down_period: 120s" >> app.yaml
echo " cool_down_period_sec: 120" >> app.yaml
echo " min_num_instances: 1" >> app.yaml
echo " max_num_instances: 3" >> app.yaml
echo " cpu_utilization:" >> app.yaml
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/deploy-frontends-to-production.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
echo "includes:" >> app.yaml
echo " - .env.yaml" >> app.yaml
echo "automatic_scaling:" >> app.yaml
echo " cool_down_period: 120s" >> app.yaml
echo " cool_down_period_sec: 120" >> app.yaml
echo " min_num_instances: 1" >> app.yaml
echo " max_num_instances: 10" >> app.yaml
echo " cpu_utilization:" >> app.yaml
Expand Down Expand Up @@ -278,14 +278,20 @@ jobs:
echo "includes:" >> app.yaml
echo " - .env.yaml" >> app.yaml
echo "automatic_scaling:" >> app.yaml
echo " cool_down_period: 80s" >> app.yaml
echo " min_num_instances: 1" >> app.yaml
echo " cool_down_period_sec: 80" >> app.yaml
echo " min_num_instances: 2" >> app.yaml
echo " max_num_instances: 10" >> app.yaml
echo " cpu_utilization:" >> app.yaml
echo " target_utilization: 0.8" >> app.yaml
echo "runtime_config:" >> app.yaml
echo " operating_system: \"ubuntu22\"" >> app.yaml
echo " runtime_version: \"3.12\"" >> app.yaml
echo "readiness_check:" >> app.yaml
echo " check_interval_sec: 5" >> app.yaml
echo " timeout_sec: 4" >> app.yaml
echo " failure_threshold: 2" >> app.yaml
echo " success_threshold: 2" >> app.yaml
echo " app_start_timeout_sec: 1800" >> app.yaml
echo "========== Creating .env.yaml file =========="
echo "env_variables:" > .env.yaml
echo " SECRET: ${{ secrets.WEBSITE_SECRET }}" >> .env.yaml
Expand Down Expand Up @@ -314,7 +320,7 @@ jobs:
--image-url=${{ env.REGISTRY_URL }}/${{ secrets.FRONTEND_PROJECT_ID }}/airqo-website2:latest \
--project=${{ secrets.FRONTEND_PROJECT_ID }} \
--quiet
- name: Delete Old Versions
run: |-
service="default"
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/deploy-frontends-to-staging.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ jobs:
echo "includes:" >> app.yaml
echo " - .env.yaml" >> app.yaml
echo "automatic_scaling:" >> app.yaml
echo " cool_down_period: 120s" >> app.yaml
echo " cool_down_period_sec: 120" >> app.yaml
echo " min_num_instances: 1" >> app.yaml
echo " max_num_instances: 5" >> app.yaml
echo " cpu_utilization:" >> app.yaml
Expand Down Expand Up @@ -330,11 +330,17 @@ jobs:
echo "includes:" >> app.yaml
echo " - .env.yaml" >> app.yaml
echo "automatic_scaling:" >> app.yaml
echo " cool_down_period: 120s" >> app.yaml
echo " cool_down_period_sec: 120" >> app.yaml
echo " min_num_instances: 1" >> app.yaml
echo " max_num_instances: 5" >> app.yaml
echo " cpu_utilization:" >> app.yaml
echo " target_utilization: 0.8" >> app.yaml
echo "readiness_check:" >> app.yaml
echo " check_interval_sec: 5" >> app.yaml
echo " timeout_sec: 4" >> app.yaml
echo " failure_threshold: 2" >> app.yaml
echo " success_threshold: 2" >> app.yaml
echo " app_start_timeout_sec: 1800" >> app.yaml
echo "========== Creating .env.yaml file =========="
echo "env_variables:" > .env.yaml
echo "runtime_config:" >> app.yaml
Expand Down
2 changes: 1 addition & 1 deletion k8s/platform/values-prod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1
image:
repository: eu.gcr.io/airqo-250220/airqo-next-platform
pullPolicy: Always
tag: prod-48adfeaa-1737641861
tag: prod-87212ef4-1737696175
imagePullSecrets: []
nameOverride: ''
fullnameOverride: ''
Expand Down
2 changes: 1 addition & 1 deletion k8s/platform/values-stage.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1
image:
repository: eu.gcr.io/airqo-250220/airqo-stage-next-platform
pullPolicy: Always
tag: stage-87a3d931-1737641477
tag: stage-68854d0b-1737695785
imagePullSecrets: []
nameOverride: ''
fullnameOverride: ''
Expand Down
5 changes: 5 additions & 0 deletions mobile-v3/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
} catch (Exception e) {
Log.e(TAG, "Error registering plugin google_maps_flutter_android, io.flutter.plugins.googlemaps.GoogleMapsPlugin", e);
}
try {
flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin package_info_plus, dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
} catch (Exception e) {
Expand Down
3 changes: 3 additions & 0 deletions mobile-v3/assets/icons/chevron-right.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 91afbf1

Please sign in to comment.