From 1e787570baf41cfd29508b50b86e979d603b0d81 Mon Sep 17 00:00:00 2001 From: googleworkspace-bot Date: Fri, 29 Jul 2022 17:13:36 +0000 Subject: [PATCH 1/2] chore: Synced local '.github/sync-repo-settings.yaml' with remote 'sync-files/defaults/.github/sync-repo-settings.yaml' --- .github/sync-repo-settings.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 757d7bb5..1e81cab7 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -34,21 +34,6 @@ branchProtectionRules: - "conventionalcommits.org" requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true - - pattern: master - isAdminEnforced: false - requiresStrictStatusChecks: false - requiredStatusCheckContexts: - # .github/workflows/test.yml with a job called "test" - - "test" - # .github/workflows/lint.yml with a job called "lint" - - "lint" - # Google bots below - - "cla/google" - - "snippet-bot check" - - "header-check" - - "conventionalcommits.org" - requiredApprovingReviewCount: 1 - requiresCodeOwnerReviews: true permissionRules: - team: workspace-devrel-dpe permission: admin From 2a61c9b2b29b7b7ff536795c72aec9dc09ed0493 Mon Sep 17 00:00:00 2001 From: googleworkspace-bot Date: Fri, 29 Jul 2022 17:13:36 +0000 Subject: [PATCH 2/2] chore: Synced local '.github/workflows/automation.yml' with remote 'sync-files/defaults/.github/workflows/automation.yml' --- .github/workflows/automation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 5144afe4..b01e9cf9 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -58,12 +58,12 @@ jobs: - if: ${{ env.DEFAULT_BRANCH == 'main' && env.HAS_MASTER_BRANCH == 'true' }} name: Update master branch from main run: | - git checkout -b master + git checkout -B master git reset --hard origin/main git push origin master - if: ${{ env.DEFAULT_BRANCH == 'master'}} name: Update main branch from master run: | - git checkout -b main + git checkout -B main git reset --hard origin/master git push origin main