From 871881ed411bfb3e9975da184c08ef50cf685f84 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Wed, 28 Feb 2024 09:28:13 -0800 Subject: [PATCH 1/2] Set git config user for sync_main_latest workflow. --- .github/workflows/sync_main_latest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sync_main_latest.yml b/.github/workflows/sync_main_latest.yml index 455feef8..46c5a502 100644 --- a/.github/workflows/sync_main_latest.yml +++ b/.github/workflows/sync_main_latest.yml @@ -13,6 +13,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Set git config user + run: git config user.email "compose-devrel-github-bot@google.com" && git config user.name "compose-devrel-github-bot" + - name: Merge main into latest run: git fetch && git switch latest && git merge -s ours origin/main --allow-unrelated-histories From 11de275906e46f7fac86d048706a3f846905c131 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Wed, 28 Feb 2024 09:58:31 -0800 Subject: [PATCH 2/2] Update PR description. --- .github/workflows/sync_main_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_main_latest.yml b/.github/workflows/sync_main_latest.yml index 46c5a502..38c56bbb 100644 --- a/.github/workflows/sync_main_latest.yml +++ b/.github/workflows/sync_main_latest.yml @@ -31,5 +31,5 @@ jobs: branch: bot-sync-main delete-branch: true title: '🤖 Sync main to latest' - body: Updated dependencies + body: 'Update `latest` with `main`' reviewers: ${{ github.actor }}