diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index af33e4cd2..90a7fa91b 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -3,7 +3,7 @@ name: Main Deploy Workflow on: push: branches: - - main + - main-2 workflow_dispatch: env: diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 13c89a4fc..d8be529b8 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -22,49 +22,8 @@ jobs: with: flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - - name: Set up Android SDK - if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu - uses: android-actions/setup-android@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.3' - name: Update env files to selected environment run: | rm .env rm assets/.env - echo "$WEB_APP_ENV" >> .env - cp .env assets/.env - - name: Apply .env patch - run: git apply ./scripts/enable_mobile_env.patch - - name: Install Fastlane - run: gem install fastlane -NV - - name: Remove Emoji Font - run: | - rm -rf fonts/NotoEmoji - yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml - - run: flutter pub get - - name: Prepare Android Release Build - env: - PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }} - PLAY_STORE_KEYSTORE_KEY_ALIAS: ${{ secrets.PLAY_STORE_KEYSTORE_KEY_ALIAS }} - PLAY_STORE_KEYSTORE_STORE_PASSWORD: ${{ secrets.PLAY_STORE_KEYSTORE_STORE_PASSWORD }} - PLAY_STORE_KEYSTORE_KEY_PASSWORD: ${{ secrets.PLAY_STORE_KEYSTORE_KEY_PASSWORD }} - PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }} - run: ./scripts/prepare-android-release.sh - - name: Build Android Release - run: flutter build appbundle --target-platform android-arm,android-arm64,android-x64 - - name: Deploy Android Release - run: | - mkdir -p build/android - cp build/app/outputs/bundle/release/app-release.aab build/android/ - cd android - bundle install - bundle update fastlane - bundle exec fastlane deploy_internal_test - if [[ $GITHUB_REF_NAME == rc* ]]; then - bundle exec fastlane deploy_candidate - else - bundle exec fastlane deploy_release - fi - cd .. \ No newline at end of file + echo "$WEB_APP_ENV" \ No newline at end of file