From 0819b8b20150333409d95b05869424d77e230511 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sun, 23 Mar 2025 22:11:24 +0100 Subject: [PATCH 1/9] some initial changes --- .gitea/workflows/frontend_build-android.yaml | 67 ----------------- .../workflows/frontend_build-app-android.yaml | 72 ++++++++++++++++++ .gitea/workflows/frontend_build-app-ios.yaml | 73 +++++++++++++++++++ .gitea/workflows/frontend_build-web.yaml | 34 --------- .../frontend_trigger_deployment.yaml | 39 ---------- 5 files changed, 145 insertions(+), 140 deletions(-) delete mode 100644 .gitea/workflows/frontend_build-android.yaml create mode 100644 .gitea/workflows/frontend_build-app-android.yaml create mode 100644 .gitea/workflows/frontend_build-app-ios.yaml delete mode 100644 .gitea/workflows/frontend_build-web.yaml delete mode 100644 .gitea/workflows/frontend_trigger_deployment.yaml diff --git a/.gitea/workflows/frontend_build-android.yaml b/.gitea/workflows/frontend_build-android.yaml deleted file mode 100644 index e119bad..0000000 --- a/.gitea/workflows/frontend_build-android.yaml +++ /dev/null @@ -1,67 +0,0 @@ -on: - pull_request: - branches: - - main - paths: - - frontend/** - - -name: Build and release debug APK - -jobs: - build: - name: Build APK - runs-on: ubuntu-latest - steps: - - - name: Install prerequisites - run: | - apt-get update - apt-get install -y jq - - - uses: https://gitea.com/actions/checkout@v4 - - - - uses: https://github.com/actions/setup-java@v4 - with: - java-version: '17' - distribution: 'zulu' - - - name: Fix flutter SDK folder permission - run: git config --global --add safe.directory "*" - - - uses: https://github.com/subosito/flutter-action@v2 - with: - channel: stable - flutter-version: 3.22.0 - cache: true - - - name: Setup Android SDK - uses: https://github.com/android-actions/setup-android@v3 - - - run: flutter pub get - working-directory: ./frontend - - - name: Add required secrets - env: - ANDROID_SECRETS_PROPERTIES: ${{ secrets.ANDROID_SECRETS_PROPERTIES }} - run: | - echo "$ANDROID_SECRETS_PROPERTIES" >> ./android/secrets.properties - working-directory: ./frontend - - - name: Sanity check - run: | - ls - ls -lah android - working-directory: ./frontend - - - run: flutter build apk --debug --split-per-abi --build-number=${{ gitea.run_number }} - working-directory: ./frontend - - - name: Upload APKs to artifacts - uses: https://gitea.com/actions/upload-artifact@v3 - with: - name: app-release - path: frontend/build/app/outputs/flutter-apk/ - if-no-files-found: error - retention-days: 15 diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml new file mode 100644 index 0000000..3d55849 --- /dev/null +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -0,0 +1,72 @@ +on: + pull_request: + branches: + - main + paths: + - frontend/** + + +name: Build and release debug APK + +defaults: + run: + working-directory: frontend/android + + +jobs: + build: + name: Build APK + runs-on: macos + env: + # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps + BUNDLE_GEMFILE: ${{ gitea.workspace }}/frontend/android/Gemfile + + steps: + - uses: https://gitea.com/actions/checkout@v4 + + # Selfhosted actions require a few extra steps + - name: Install prerequisites + run: | + apt-get update + apt-get install -y jq + + - uses: https://github.com/actions/setup-java@v4 + with: + java-version: '17' + distribution: 'zulu' + + - name: Fix flutter SDK folder permission + run: git config --global --add safe.directory "*" + + - uses: https://github.com/subosito/flutter-action@v2 + with: + channel: stable + flutter-version: 3.22.0 + cache: true + + - name: Setup Android SDK + uses: https://github.com/android-actions/setup-android@v3 + + - run: flutter pub get + working-directory: ./frontend + + - name: Set up ruby env and install fastlane + uses: https://github.com/ruby/setup-ruby@v1 + with: + ruby-version: 3.3 + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + + - name: Add required secrets + run: | + echo "${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties + echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json + echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore + working-directory: android + + - name: Run fastlane lane + run: bundle exec fastlane deploy_release + working-directory: android + env: + BUILD_NUMBER: ${{ github.run_number }} + # BUILD_NAME is implicitly available + GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} diff --git a/.gitea/workflows/frontend_build-app-ios.yaml b/.gitea/workflows/frontend_build-app-ios.yaml new file mode 100644 index 0000000..a6ab07c --- /dev/null +++ b/.gitea/workflows/frontend_build-app-ios.yaml @@ -0,0 +1,73 @@ +on: + pull_request: + branches: + - main + paths: + - frontend/** + +name: Build and release debugging app to ios testflight + +defaults: + run: + working-directory: frontend/android + +jobs: + build: + runs-on: macos + env: + # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps + BUNDLE_GEMFILE: ${{ gitea.workspace }}/frontend/ios/Gemfile + + steps: + - uses: https://gitea.com/actions/checkout@v4 + + - name: Set up ruby env + uses: https://github.com/ruby/setup-ruby@v1 + with: + ruby-version: 3.3 + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + + - name: Install Flutter + uses: https://github.com/subosito/flutter-action@v2 + with: + channel: stable + flutter-version: 3.22.0 + cache: true + + - name: Infer version number from git tag + id: version + env: + REF_NAME: ${{ gitea.ref_name }} + run: + # remove the 'v' prefix from the tag name + echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV + + - name: Setup SSH key for match git repo + # and mark the host as known + run: | + echo $MATCH_REPO_SSH_KEY | base64 --decode > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -p 2222 git.kluster.moll.re > ~/.ssh/known_hosts + env: + MATCH_REPO_SSH_KEY: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }} + + - name: Install dependencies and clean up + run: | + flutter pub get + bundle exec pod install + flutter clean + bundle exec pod cache clean --all + working-directory: ios + + - name: Run fastlane lane + run: bundle exec fastlane deploy_release --verbose + working-directory: ios + env: + BUILD_NUMBER: ${{ gitea.run_number }} + # BUILD_NAME is implicitly available + GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} + IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} + IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }} + IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }} + MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }} + IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }} diff --git a/.gitea/workflows/frontend_build-web.yaml b/.gitea/workflows/frontend_build-web.yaml deleted file mode 100644 index 05f28d4..0000000 --- a/.gitea/workflows/frontend_build-web.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# on: -# pull_request: -# branches: -# - main -# paths: -# - frontend/** - - -# name: Build web - -# jobs: -# build: -# name: Build Web -# runs-on: ubuntu-latest -# steps: - -# - name: Install prerequisites -# run: | -# sudo apt-get update -# sudo apt-get install -y xz-utils - -# - uses: actions/checkout@v4 - -# - uses: https://github.com/subosito/flutter-action@v2 -# with: -# channel: stable -# flutter-version: 3.19.6 -# cache: true - -# - run: flutter pub get -# working-directory: ./frontend - -# - run: flutter build web -# working-directory: ./frontend diff --git a/.gitea/workflows/frontend_trigger_deployment.yaml b/.gitea/workflows/frontend_trigger_deployment.yaml deleted file mode 100644 index 1f32b0d..0000000 --- a/.gitea/workflows/frontend_trigger_deployment.yaml +++ /dev/null @@ -1,39 +0,0 @@ -on: - push: - tags: - - v* - -jobs: - push-to-remote: - # We want to use the macos runner provided by github actions. This requires to push to a remote first. - # After the push we can use the action under frontend/.github/actions/ to deploy properly using fastlane on macos. - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - path: 'src' - - - name: Checkout remote repository - uses: actions/checkout@v3 - with: - path: 'dest' - ref: 'main' - github-server-url: 'https://github.com' - repository: 'moll-re/anyway-frontend-builder' - token: ${{ secrets.PUSH_GITHUB_API_TOKEN }} - fetch-depth: 0 - persist-credentials: true - - - name: Copy files to remote repository - run: cp -r src/frontend/. dest/ - - - name: Commit and push changes - run: | - cd dest - git config --global user.email "me@moll.re" - git config --global user.name "[bot]" - git add . - git commit -m "Automatic code update for tag" - git tag -a ${{ github.ref_name }} -m "mirrored tag" - git push origin main --tags From e3d2c51c6df9209370c42a897e40ca02946bf646 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 09:21:04 +0100 Subject: [PATCH 2/9] remove workflow run restrictions for now --- .gitea/workflows/frontend_build-app-android.yaml | 4 ++-- .gitea/workflows/frontend_build-app-ios.yaml | 4 ++-- frontend/ios/fastlane/Fastfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml index 3d55849..2a53a89 100644 --- a/.gitea/workflows/frontend_build-app-android.yaml +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -2,8 +2,8 @@ on: pull_request: branches: - main - paths: - - frontend/** + # paths: + # - frontend/** name: Build and release debug APK diff --git a/.gitea/workflows/frontend_build-app-ios.yaml b/.gitea/workflows/frontend_build-app-ios.yaml index a6ab07c..615a296 100644 --- a/.gitea/workflows/frontend_build-app-ios.yaml +++ b/.gitea/workflows/frontend_build-app-ios.yaml @@ -2,8 +2,8 @@ on: pull_request: branches: - main - paths: - - frontend/** + # paths: + # - frontend/** name: Build and release debugging app to ios testflight diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index b5e15f1..285d3a3 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -87,7 +87,7 @@ platform :ios do skip_build_archive: true, archive_path: "../build/ios/archive/Runner.xcarchive" ) - + upload_to_app_store( skip_screenshots: true, skip_metadata: true, From 6af74804ec2f26c1669185a4ae99939c7e3e3460 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 11:09:26 +0100 Subject: [PATCH 3/9] more pipeline fixes --- .../workflows/frontend_build-app-android.yaml | 38 +-- .gitea/workflows/frontend_build-app-ios.yaml | 34 +-- frontend/android/Gemfile.lock | 220 ------------- frontend/ios/Gemfile.lock | 288 ------------------ 4 files changed, 36 insertions(+), 544 deletions(-) delete mode 100644 frontend/android/Gemfile.lock delete mode 100644 frontend/ios/Gemfile.lock diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml index 2a53a89..3ab7e76 100644 --- a/.gitea/workflows/frontend_build-app-android.yaml +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -24,31 +24,27 @@ jobs: steps: - uses: https://gitea.com/actions/checkout@v4 - # Selfhosted actions require a few extra steps - - name: Install prerequisites - run: | - apt-get update - apt-get install -y jq - - uses: https://github.com/actions/setup-java@v4 with: java-version: '17' distribution: 'zulu' + - name: Setup Android SDK + uses: https://github.com/android-actions/setup-android@v3 + - name: Fix flutter SDK folder permission run: git config --global --add safe.directory "*" - uses: https://github.com/subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.22.0 + flutter-version-file: ${{ gitea.workspace }}/frontend/pubspec.yaml cache: true - - name: Setup Android SDK - uses: https://github.com/android-actions/setup-android@v3 - - - run: flutter pub get - working-directory: ./frontend + - name: Install dependencies and clean up + run: | + flutter pub get + flutter clean - name: Set up ruby env and install fastlane uses: https://github.com/ruby/setup-ruby@v1 @@ -56,17 +52,23 @@ jobs: ruby-version: 3.3 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - name: Add required secrets + - name: Infer version number from git tag + id: version + env: + REF_NAME: ${{ gitea.ref_name }} + run: + # remove the 'v' prefix from the tag name + echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV + + - name: Add required secret files run: | echo "${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}" | base64 -d > secrets.properties echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}" | base64 -d > google-key.json echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore - working-directory: android - name: Run fastlane lane - run: bundle exec fastlane deploy_release - working-directory: android + run: bundle exec fastlane deploy_beta env: - BUILD_NUMBER: ${{ github.run_number }} + BUILD_NUMBER: ${{ gitea.run_number }} # BUILD_NAME is implicitly available - GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }} + ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }} diff --git a/.gitea/workflows/frontend_build-app-ios.yaml b/.gitea/workflows/frontend_build-app-ios.yaml index 615a296..aa30ae5 100644 --- a/.gitea/workflows/frontend_build-app-ios.yaml +++ b/.gitea/workflows/frontend_build-app-ios.yaml @@ -9,7 +9,7 @@ name: Build and release debugging app to ios testflight defaults: run: - working-directory: frontend/android + working-directory: frontend/ios jobs: build: @@ -21,19 +21,26 @@ jobs: steps: - uses: https://gitea.com/actions/checkout@v4 + - name: Install Flutter + uses: https://github.com/subosito/flutter-action@v2 + with: + channel: stable + flutter-version-file: ${{ gitea.workspace }}/frontend/pubspec.yaml + cache: true + + - name: Install dependencies and clean up + run: | + flutter pub get + bundle exec pod install + flutter clean + bundle exec pod cache clean --all + - name: Set up ruby env uses: https://github.com/ruby/setup-ruby@v1 with: ruby-version: 3.3 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - name: Install Flutter - uses: https://github.com/subosito/flutter-action@v2 - with: - channel: stable - flutter-version: 3.22.0 - cache: true - - name: Infer version number from git tag id: version env: @@ -51,17 +58,8 @@ jobs: env: MATCH_REPO_SSH_KEY: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }} - - name: Install dependencies and clean up - run: | - flutter pub get - bundle exec pod install - flutter clean - bundle exec pod cache clean --all - working-directory: ios - - name: Run fastlane lane - run: bundle exec fastlane deploy_release --verbose - working-directory: ios + run: bundle exec fastlane deploy_beta env: BUILD_NUMBER: ${{ gitea.run_number }} # BUILD_NAME is implicitly available diff --git a/frontend/android/Gemfile.lock b/frontend/android/Gemfile.lock deleted file mode 100644 index a427422..0000000 --- a/frontend/android/Gemfile.lock +++ /dev/null @@ -1,220 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.7) - base64 - nkf - rexml - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - artifactory (3.0.17) - atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.970.0) - aws-sdk-core (3.202.2) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.9) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) - aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.159.0) - aws-sdk-core (~> 3, >= 3.201.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - base64 (0.2.0) - claide (1.1.0) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - declarative (0.0.20) - digest-crc (0.6.5) - rake (>= 12.0.0, < 14.0.0) - domain_name (0.6.20240107) - dotenv (2.8.1) - emoji_regex (3.2.3) - excon (0.111.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.222.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored (~> 1.2) - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-env (>= 1.6.0, < 2.0.0) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - http-cookie (~> 1.0.5) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (>= 2.0.0, < 3.0.0) - naturally (~> 2.2) - optparse (>= 0.1.1, < 1.0.0) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.5) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (~> 3) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.54.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.3) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-playcustomapp_v1 (0.13.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.31.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.1) - google-cloud-env (>= 1.0, < 3.a) - google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) - google-cloud-storage (1.47.0) - addressable (~> 2.8) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.31.0) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - highline (2.0.3) - http-cookie (1.0.7) - domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.6.2) - json (2.7.2) - jwt (2.8.2) - base64 - mini_magick (4.13.2) - mini_mime (1.1.5) - multi_json (1.15.0) - multipart-post (2.4.1) - nanaimo (0.3.0) - naturally (2.2.1) - nkf (0.2.0) - optparse (0.5.0) - os (1.1.4) - plist (3.7.1) - public_suffix (6.0.1) - rake (13.2.1) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.3.6) - strscan - rouge (2.0.7) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - security (0.1.5) - signet (0.19.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.10) - CFPropertyList - naturally - strscan (3.1.0) - terminal-notifier (2.0.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - trailblazer-option (0.1.2) - tty-cursor (0.7.1) - tty-screen (0.8.2) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - uber (0.1.0) - unicode-display_width (2.5.0) - word_wrap (1.0.0) - xcodeproj (1.25.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - x86_64-linux - -DEPENDENCIES - fastlane - -BUNDLED WITH - 2.5.18 diff --git a/frontend/ios/Gemfile.lock b/frontend/ios/Gemfile.lock deleted file mode 100644 index 31610d7..0000000 --- a/frontend/ios/Gemfile.lock +++ /dev/null @@ -1,288 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.7) - base64 - nkf - rexml - activesupport (5.2.8.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - artifactory (3.0.17) - atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.1004.0) - aws-sdk-core (3.212.0) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.95.0) - aws-sdk-core (~> 3, >= 3.210.0) - aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.170.1) - aws-sdk-core (~> 3, >= 3.210.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.1) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - base64 (0.2.0) - claide (1.1.0) - cocoapods (1.10.2) - addressable (~> 2.6) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.2) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.6.6) - nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.2) - activesupport (> 5.0, < 6) - addressable (~> 2.6) - algoliasearch (~> 1.0) - concurrent-ruby (~> 1.1) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - netrc (~> 0.11) - public_suffix - typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.1) - cocoapods-trunk (1.6.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - concurrent-ruby (1.3.4) - declarative (0.0.20) - digest-crc (0.6.5) - rake (>= 12.0.0, < 14.0.0) - domain_name (0.6.20240107) - dotenv (2.8.1) - emoji_regex (3.2.3) - escape (0.0.4) - ethon (0.16.0) - ffi (>= 1.15.0) - excon (0.112.0) - faraday (1.10.4) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.1) - faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.225.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored (~> 1.2) - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - fastlane-sirp (>= 1.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-env (>= 1.6.0, < 2.0.0) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - http-cookie (~> 1.0.5) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (>= 2.0.0, < 3.0.0) - naturally (~> 2.2) - optparse (>= 0.1.1, < 1.0.0) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.5) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (~> 3) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - fastlane-sirp (1.0.0) - sysrandom (~> 1.0) - ffi (1.17.0) - ffi (1.17.0-x86_64-darwin) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.54.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.3) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-playcustomapp_v1 (0.13.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.31.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.1) - google-cloud-env (>= 1.0, < 3.a) - google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) - google-cloud-storage (1.47.0) - addressable (~> 2.8) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.31.0) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - highline (2.0.3) - http-cookie (1.0.7) - domain_name (~> 0.5) - httpclient (2.8.3) - i18n (1.14.6) - concurrent-ruby (~> 1.0) - jmespath (1.6.2) - json (2.8.1) - jwt (2.9.3) - base64 - mini_magick (4.13.2) - mini_mime (1.1.5) - minitest (5.25.1) - molinillo (0.6.6) - multi_json (1.15.0) - multipart-post (2.4.1) - nanaimo (0.4.0) - nap (1.1.0) - naturally (2.2.1) - netrc (0.11.0) - nkf (0.2.0) - optparse (0.6.0) - os (1.1.4) - plist (3.7.1) - public_suffix (6.0.1) - rake (13.2.1) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.3.9) - rouge (2.0.7) - ruby-macho (1.4.0) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - security (0.1.5) - signet (0.19.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.10) - CFPropertyList - naturally - sysrandom (1.0.5) - terminal-notifier (2.0.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - thread_safe (0.3.6) - trailblazer-option (0.1.2) - tty-cursor (0.7.1) - tty-screen (0.8.2) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - typhoeus (1.4.1) - ethon (>= 0.9.0) - tzinfo (1.2.11) - thread_safe (~> 0.1) - uber (0.1.0) - unicode-display_width (2.6.0) - word_wrap (1.0.0) - xcodeproj (1.27.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.4.0) - rexml (>= 3.3.6, < 4.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - x86_64-darwin-23 - -DEPENDENCIES - cocoapods - fastlane - -BUNDLED WITH - 2.5.23 From 2df8a22239f095003e31663cd6f09e6b9369e40a Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 11:23:39 +0100 Subject: [PATCH 4/9] fix missing entry in pubspec --- frontend/pubspec.lock | 2 +- frontend/pubspec.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock index 385b2a0..7d97f7a 100644 --- a/frontend/pubspec.lock +++ b/frontend/pubspec.lock @@ -1015,4 +1015,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.7.0 <4.0.0" - flutter: ">=3.27.0" + flutter: ">=3.29.1" diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml index ea783ef..3cf2a53 100644 --- a/frontend/pubspec.yaml +++ b/frontend/pubspec.yaml @@ -20,6 +20,7 @@ version: 1.0.0+1 environment: sdk: '>=3.3.4 <4.0.0' + flutter: 3.29.1 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 86fd50e21d6e089abdc24810a85cf18261dd929c Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 11:39:09 +0100 Subject: [PATCH 5/9] manually specify flutter version in actions --- .gitea/workflows/frontend_build-app-android.yaml | 2 +- .gitea/workflows/frontend_build-app-ios.yaml | 2 +- frontend/pubspec.lock | 2 +- frontend/pubspec.yaml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml index 3ab7e76..0cd69ed 100644 --- a/.gitea/workflows/frontend_build-app-android.yaml +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -38,7 +38,7 @@ jobs: - uses: https://github.com/subosito/flutter-action@v2 with: channel: stable - flutter-version-file: ${{ gitea.workspace }}/frontend/pubspec.yaml + flutter-version: 3.22 cache: true - name: Install dependencies and clean up diff --git a/.gitea/workflows/frontend_build-app-ios.yaml b/.gitea/workflows/frontend_build-app-ios.yaml index aa30ae5..6756d30 100644 --- a/.gitea/workflows/frontend_build-app-ios.yaml +++ b/.gitea/workflows/frontend_build-app-ios.yaml @@ -25,7 +25,7 @@ jobs: uses: https://github.com/subosito/flutter-action@v2 with: channel: stable - flutter-version-file: ${{ gitea.workspace }}/frontend/pubspec.yaml + flutter-version: 3.22 cache: true - name: Install dependencies and clean up diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock index 7d97f7a..385b2a0 100644 --- a/frontend/pubspec.lock +++ b/frontend/pubspec.lock @@ -1015,4 +1015,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.7.0 <4.0.0" - flutter: ">=3.29.1" + flutter: ">=3.27.0" diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml index 3cf2a53..ea783ef 100644 --- a/frontend/pubspec.yaml +++ b/frontend/pubspec.yaml @@ -20,7 +20,6 @@ version: 1.0.0+1 environment: sdk: '>=3.3.4 <4.0.0' - flutter: 3.29.1 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 21f57f6929e9b4f7c6831c7a534f0e7cb5b63c40 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 11:47:19 +0100 Subject: [PATCH 6/9] try once more --- .gitea/workflows/frontend_build-app-android.yaml | 3 ++- .gitea/workflows/frontend_build-app-ios.yaml | 3 ++- frontend/pubspec.lock | 2 +- frontend/pubspec.yaml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml index 0cd69ed..d207621 100644 --- a/.gitea/workflows/frontend_build-app-android.yaml +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -38,7 +38,8 @@ jobs: - uses: https://github.com/subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.22 + flutter-version-file: ${{ gitea.workspace }}/frontend/pubspec.yaml + architecture: x64 cache: true - name: Install dependencies and clean up diff --git a/.gitea/workflows/frontend_build-app-ios.yaml b/.gitea/workflows/frontend_build-app-ios.yaml index 6756d30..b46ecae 100644 --- a/.gitea/workflows/frontend_build-app-ios.yaml +++ b/.gitea/workflows/frontend_build-app-ios.yaml @@ -25,7 +25,8 @@ jobs: uses: https://github.com/subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.22 + flutter-version-file: ${{ gitea.workspace }}/frontend/pubspec.yaml + architecture: x64 cache: true - name: Install dependencies and clean up diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock index 385b2a0..7d97f7a 100644 --- a/frontend/pubspec.lock +++ b/frontend/pubspec.lock @@ -1015,4 +1015,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.7.0 <4.0.0" - flutter: ">=3.27.0" + flutter: ">=3.29.1" diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml index ea783ef..3210ac0 100644 --- a/frontend/pubspec.yaml +++ b/frontend/pubspec.yaml @@ -20,6 +20,7 @@ version: 1.0.0+1 environment: sdk: '>=3.3.4 <4.0.0' + flutter: '3.29.1' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From a7e355324643407850c971cc7c65983f82a2fb4f Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 12:14:12 +0100 Subject: [PATCH 7/9] rename lanes --- .gitea/workflows/frontend_build-app-android.yaml | 1 - frontend/android/fastlane/Fastfile | 3 ++- frontend/ios/fastlane/Fastfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml index d207621..a7114de 100644 --- a/.gitea/workflows/frontend_build-app-android.yaml +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -15,7 +15,6 @@ defaults: jobs: build: - name: Build APK runs-on: macos env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps diff --git a/frontend/android/fastlane/Fastfile b/frontend/android/fastlane/Fastfile index edaf308..326cf13 100644 --- a/frontend/android/fastlane/Fastfile +++ b/frontend/android/fastlane/Fastfile @@ -3,7 +3,7 @@ default_platform(:android) platform :android do desc "Deploy a new version to closed testing (play store)" - lane :deploy_testing do + lane :deploy_beta do build_name = ENV["BUILD_NAME"] build_number = ENV["BUILD_NUMBER"] @@ -18,6 +18,7 @@ platform :android do upload_to_play_store( track: 'alpha', + # upload aab files intstead skip_upload_apk: true, skip_upload_changelogs: true, aab: "../build/app/outputs/bundle/release/app-release.aab", diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index 285d3a3..d20b409 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -15,7 +15,7 @@ platform :ios do desc "Deploy a new version to closed testing (testflight)" - lane :deploy_testing do + lane :deploy_beta do build_name = ENV["BUILD_NAME"] build_number = ENV["BUILD_NUMBER"] From bda87859ee38dfbedd4feb65ce65d6a411d71555 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 24 Mar 2025 12:55:00 +0100 Subject: [PATCH 8/9] app build fixes for ios and android --- frontend/android/app/build.gradle | 2 +- frontend/ios/fastlane/Fastfile | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/android/app/build.gradle b/frontend/android/app/build.gradle index 0cd6cdd..1602d04 100644 --- a/frontend/android/app/build.gradle +++ b/frontend/android/app/build.gradle @@ -77,7 +77,7 @@ android { versionCode flutterVersionCode.toInteger() versionName flutterVersionName // // Placeholders of keys that are replaced by the build system. - manifestPlaceholders += ['MAPS_API_KEY': System.getenv('GOOGLE_MAPS_API_KEY')] + manifestPlaceholders += ['MAPS_API_KEY': System.getenv('ANDROID_GOOGLE_MAPS_API_KEY')] } diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile index d20b409..9d10687 100644 --- a/frontend/ios/fastlane/Fastfile +++ b/frontend/ios/fastlane/Fastfile @@ -28,12 +28,22 @@ platform :ios do readonly: true, ) + # replace secrets by real values, the stupid way + sh( + "sed", + "-i", + "", + "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g", + "../Runner/AppDelegate.swift" + ) + + sh( "flutter", "build", "ipa", - "--debug", + "--release", "--build-name=#{build_name}", "--build-number=#{build_number}", ) From efd332f8c5b40c12aa672337b2718b43df622fc3 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Tue, 1 Apr 2025 19:01:58 +0200 Subject: [PATCH 9/9] readd run conditions --- .gitea/workflows/frontend_build-app-android.yaml | 4 ++-- .gitea/workflows/frontend_build-app-ios.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/frontend_build-app-android.yaml b/.gitea/workflows/frontend_build-app-android.yaml index a7114de..bf234ed 100644 --- a/.gitea/workflows/frontend_build-app-android.yaml +++ b/.gitea/workflows/frontend_build-app-android.yaml @@ -2,8 +2,8 @@ on: pull_request: branches: - main - # paths: - # - frontend/** + paths: + - frontend/** name: Build and release debug APK diff --git a/.gitea/workflows/frontend_build-app-ios.yaml b/.gitea/workflows/frontend_build-app-ios.yaml index b46ecae..bb60e79 100644 --- a/.gitea/workflows/frontend_build-app-ios.yaml +++ b/.gitea/workflows/frontend_build-app-ios.yaml @@ -2,8 +2,8 @@ on: pull_request: branches: - main - # paths: - # - frontend/** + paths: + - frontend/** name: Build and release debugging app to ios testflight