From a8a2bbe27f71e418b6f80345b8b4f2826ea68d84 Mon Sep 17 00:00:00 2001 From: Chiedo John <2156688+chiedo@users.noreply.github.com> Date: Mon, 22 Feb 2021 08:30:14 -0500 Subject: [PATCH] Allow Repo Sync to continue running during freezes (#17924) When we do deploy changes during freezes, we want them kept in sync with the public github/docs repo. Especially during GitHub events. Co-authored-by: chiedo Co-authored-by: Rachael Sewell --- .github/workflows/repo-freeze-check.yml | 2 +- .github/workflows/repo-sync-stalls.yml | 15 +-------------- .github/workflows/repo-sync.yml | 14 -------------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/.github/workflows/repo-freeze-check.yml b/.github/workflows/repo-freeze-check.yml index a1389ba313..b50ebc2754 100644 --- a/.github/workflows/repo-freeze-check.yml +++ b/.github/workflows/repo-freeze-check.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fail if repo merges are paused - if: ${{ env.FREEZE == 'true' }} + if: ${{ env.FREEZE == 'true' && github.ref != 'refs/heads/repo-sync' }} run: | echo 'Merges into the "main" branch on this repo are currently paused!' exit 1 diff --git a/.github/workflows/repo-sync-stalls.yml b/.github/workflows/repo-sync-stalls.yml index 69729de8ef..8a83dd9777 100644 --- a/.github/workflows/repo-sync-stalls.yml +++ b/.github/workflows/repo-sync-stalls.yml @@ -5,20 +5,7 @@ on: schedule: - cron: '0 */2 * * *' -env: - FREEZE: ${{ secrets.FREEZE }} - jobs: - check-freezer: - name: Check for deployment freezes - runs-on: ubuntu-latest - steps: - - name: Exit if repo is frozen - if: ${{ env.FREEZE == 'true' }} - run: | - echo 'The repo is currently frozen! Exiting this workflow.' - exit 1 # prevents further steps from running - repo-sync-stalls: runs-on: ubuntu-latest steps: @@ -60,7 +47,7 @@ jobs: }) - name: Send Slack notification if workflow fails uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd - if: ${{ failure() && env.FREEZE != 'true' }} + if: ${{ failure() }} with: channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }} bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }} diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 90664d9bb5..cbc20bbc53 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -11,24 +11,10 @@ on: schedule: - cron: '*/15 * * * *' # every 15 minutes -env: - FREEZE: ${{ secrets.FREEZE }} - jobs: - check-freezer: - name: Check for deployment freezes - runs-on: ubuntu-latest - steps: - - name: Exit if repo is frozen - if: ${{ env.FREEZE == 'true' }} - run: | - echo 'The repo is currently frozen! Exiting this workflow.' - exit 1 # prevents further steps from running - repo-sync: if: github.repository == 'github/docs-internal' || github.repository == 'github/docs' name: Repo Sync - needs: check-freezer runs-on: ubuntu-latest steps: - name: Check out repo