Add script to merge main into all active feature branches on a regular schedule. #1394

jonsimantov · 2023-07-20T20:41:01Z

Description

Provide details of the change, and generalize the change in the PR title above.

Add a workflow that runs automatically (or manually) to create merge PRs from main into all active feature branches.

Testing

Describe how you've tested these changes. Link any manually triggered Integration tests or CPP binary SDK Packaging Github Action workflows, if applicable.

Sample PR created by this workflow: #1396

Type of Change

Place an x the applicable box:

Bug fix. Add the issue # below if applicable.
New feature. A non-breaking change which adds functionality.
Other, such as a build process or documentation change.

Notes

Bug fixes and feature changes require an update to the Release Notes section of release_build_files/readme.md.
Read the contribution guidelines CONTRIBUTING.md.
Changes to the public API require an internal API review. If you'd like to help us make Firebase APIs better, please propose your change in a feature request so that we can discuss it together.

…base/firebase-cpp-sdk into update-all-feature-branches

github-actions · 2023-07-23T18:37:24Z

❌ Integration test FAILED

Requested by @jonsimantov on commit 00eeac8
Last updated: Sun Jul 23 14:09 PDT 2023
View integration test log & download artifacts

Failures	Configs
missing_log	[BUILD] [ERROR] [Android] [1/3 os: windows]
firestore	[TEST] [ERROR] [Android] [All 2 os] [All 2 android_device]
messaging	[TEST] [FLAKINESS] [Android] [1/2 os: macos] [1/2 android_device: android_target] (1 failed tests) CRASH/TIMEOUT

Add flaky tests to go/fpl-cpp-flake-tracker

…1401) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. --------- Co-authored-by: Jon Simantov <[email protected]>

…1407) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. * Increase retry. (#1402) * Add Firestore test history report (#1403) * Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore. * Revert "OR Query Implementation (#1335)" (#1399) This reverts commit 11332d4. * Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406) * Only use flaky_test on android --------- Co-authored-by: Jon Simantov <[email protected]> Co-authored-by: Tom Andersen <[email protected]> Co-authored-by: Matthew Hyndman <[email protected]>

…1419) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. * Increase retry. (#1402) * Add Firestore test history report (#1403) * Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore. * Revert "OR Query Implementation (#1335)" (#1399) This reverts commit 11332d4. * Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406) * Only use flaky_test on android * Update the iOS version used by FTL (#1408) * Kick off nightly packaging an hour earlier (#1409) * Fix crash on gma::Initialize without a Firebase App (#1320) Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app. * build: pass along the CMake path (#1410) When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake. Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies. * Add log to gsutil fetch. (#1411) * Update mobile dependencies - Thu Aug 03 2023 (#1413) * Update mobile dependencies - Thu Aug 03 2023 ### Android - com.google.firebase.firebase_bom → 32.2.2 ### iOS - Firebase/Analytics → 10.13.0 - Firebase/AppCheck → 10.13.0 - Firebase/Auth → 10.13.0 - Firebase/Core → 10.13.0 - Firebase/CoreOnly → 10.13.0 - Firebase/Crashlytics → 10.13.0 - Firebase/Database → 10.13.0 - Firebase/DynamicLinks → 10.13.0 - Firebase/Firestore → 10.13.0 - Firebase/Functions → 10.13.0 - Firebase/Installations → 10.13.0 - Firebase/Messaging → 10.13.0 - Firebase/RemoteConfig → 10.13.0 - Firebase/Storage → 10.13.0 - Google-Mobile-Ads-SDK → 10.9.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170). * Ensure using a Swift bridging header that supports both arm64 and x86_64. * Add release note about i386 no longer being supported. * Remove armv7 as well. --------- Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Jon Simantov <[email protected]> Co-authored-by: [email protected] <[email protected]> * feat(auth): Add emulator support (#1400) * add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` --------- Co-authored-by: Cynthia Jiang <[email protected]> --------- Co-authored-by: Jon Simantov <[email protected]> Co-authored-by: Tom Andersen <[email protected]> Co-authored-by: Matthew Hyndman <[email protected]> Co-authored-by: a-maurice <[email protected]> Co-authored-by: Saleem Abdulrasool <[email protected]> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com> Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Cynthia J <[email protected]> Co-authored-by: Cynthia Jiang <[email protected]>

…1425) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. * Increase retry. (#1402) * Add Firestore test history report (#1403) * Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore. * Revert "OR Query Implementation (#1335)" (#1399) This reverts commit 11332d4. * Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406) * Only use flaky_test on android * Update the iOS version used by FTL (#1408) * Kick off nightly packaging an hour earlier (#1409) * Fix crash on gma::Initialize without a Firebase App (#1320) Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app. * build: pass along the CMake path (#1410) When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake. Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies. * Add log to gsutil fetch. (#1411) * Update mobile dependencies - Thu Aug 03 2023 (#1413) * Update mobile dependencies - Thu Aug 03 2023 ### Android - com.google.firebase.firebase_bom → 32.2.2 ### iOS - Firebase/Analytics → 10.13.0 - Firebase/AppCheck → 10.13.0 - Firebase/Auth → 10.13.0 - Firebase/Core → 10.13.0 - Firebase/CoreOnly → 10.13.0 - Firebase/Crashlytics → 10.13.0 - Firebase/Database → 10.13.0 - Firebase/DynamicLinks → 10.13.0 - Firebase/Firestore → 10.13.0 - Firebase/Functions → 10.13.0 - Firebase/Installations → 10.13.0 - Firebase/Messaging → 10.13.0 - Firebase/RemoteConfig → 10.13.0 - Firebase/Storage → 10.13.0 - Google-Mobile-Ads-SDK → 10.9.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170). * Ensure using a Swift bridging header that supports both arm64 and x86_64. * Add release note about i386 no longer being supported. * Remove armv7 as well. --------- Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Jon Simantov <[email protected]> Co-authored-by: [email protected] <[email protected]> * feat(auth): Add emulator support (#1400) * add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` --------- Co-authored-by: Cynthia Jiang <[email protected]> * Update merge-to-main script (#1420) * Before creating the merge-main PR, branch it off main, so merge conflicts can be addressed in the branch rather than by committing to main. * Format. * Update release version number for M135, 11.4.0 (#1421) * feat(auth): enable emulator support on desktop (#1423) * add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` * make json request always do restrict json * add readme info * prepare for review * some minor tweak * code format * update review comments * update the unit test after request json change --------- Co-authored-by: Cynthia Jiang <[email protected]> * Internal Updates. (#1422) * Add logic to trim webp parameter from native image urls --------- Co-authored-by: Jon Simantov <[email protected]> Co-authored-by: Tom Andersen <[email protected]> Co-authored-by: Matthew Hyndman <[email protected]> Co-authored-by: a-maurice <[email protected]> Co-authored-by: Saleem Abdulrasool <[email protected]> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com> Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Cynthia J <[email protected]> Co-authored-by: Cynthia Jiang <[email protected]> Co-authored-by: nakirekommula <[email protected]>

jonsimantov added 3 commits July 20, 2023 13:20

Add workflow for automatically updating feature branches weekly.

12ea723

Corrected filename, and added inputs.

b8a73c8

Remove trailing spaces.

af49149

jonsimantov changed the title ~~Update all feature branches~~ Add script to merge main into all active feature branches. Jul 20, 2023

jonsimantov added 23 commits July 20, 2023 13:42

Fix workflow.

2e2137a

Fix workflow name.

d2a8f35

Fix syntax.

98faefb

Fix syntax.

41dedd0

List remote branches instead.

5bf3fe8

Clean up script.

90a3e75

Untab.

601e4cc

Add branch list for debugging.

d63ee26

Untab.

707b92b

Specify remote branches.

782873f

Skip second stage if no first.

a686cc3

Typo

997046a

Error.

c7e7f05

List all branches.

1abb4d6

Fix logic.

8e54a6a

Fix spacing.

55f2ae3

Fix output

835ec7c

Fix parameters.

bc31e18

Fix merge to use origin.

266925b

Remove debug echos.

be988c4

Add git config.

ebfed91

Fix PR creation.

18b73a6

Fix PR creation.

6fbca64

jonsimantov changed the title ~~Add script to merge main into all active feature branches.~~ Add script to merge main into all active feature branches on a regular schedule. Jul 20, 2023

jonsimantov added the skip-release-notes Skip release notes check label Jul 20, 2023

Merge branch 'main' into update-all-feature-branches

85f818f

jonsimantov assigned a-maurice Jul 20, 2023

jonsimantov marked this pull request as ready for review July 20, 2023 21:27

jonsimantov requested a review from a-maurice July 20, 2023 21:28

jonsimantov added 2 commits July 20, 2023 14:29

Fix automatic push.

62339be

Merge branch 'update-all-feature-branches' of https://github.com/fire…

2be2875

…base/firebase-cpp-sdk into update-all-feature-branches

jonsimantov requested a review from cynthiajoan July 21, 2023 18:07

jonsimantov unassigned a-maurice Jul 21, 2023

cynthiajoan approved these changes Jul 21, 2023

View reviewed changes

jonsimantov merged commit 00eeac8 into main Jul 23, 2023

github-actions bot added the tests: in-progress This PR's integration tests are in progress. label Jul 23, 2023

github-actions bot added the tests: failed This PR's integration tests failed. label Jul 23, 2023

firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Jul 23, 2023

firebase locked and limited conversation to collaborators Aug 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add script to merge main into all active feature branches on a regular schedule. #1394

Add script to merge main into all active feature branches on a regular schedule. #1394

jonsimantov commented Jul 20, 2023 •

edited

Loading

github-actions bot commented Jul 23, 2023 •

edited

Loading

Add script to merge main into all active feature branches on a regular schedule. #1394

Add script to merge main into all active feature branches on a regular schedule. #1394

Conversation

jonsimantov commented Jul 20, 2023 • edited Loading

Description

Testing

Type of Change

Notes

github-actions bot commented Jul 23, 2023 • edited Loading

❌ Integration test FAILED

jonsimantov commented Jul 20, 2023 •

edited

Loading

github-actions bot commented Jul 23, 2023 •

edited

Loading