From f1ad989c9b30df9370ee8979db2ed4c39f2f5223 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Fri, 7 Aug 2020 13:27:04 -0400 Subject: [PATCH] replace master with main (#104) Signed-off-by: Alex Goodman --- .github/workflows/acceptance-test.yaml | 4 ++-- .github/workflows/release.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/acceptance-test.yaml b/.github/workflows/acceptance-test.yaml index 00b899407b5..2231c28f2bc 100644 --- a/.github/workflows/acceptance-test.yaml +++ b/.github/workflows/acceptance-test.yaml @@ -1,9 +1,9 @@ name: 'Acceptance' on: push: - # ... only act on pushes to master + # ... only act on pushes to main branches: - - master + - main # ... do not act on release tags tags-ignore: - v* diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b49b887cdfe..c4d819d4b28 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,7 +1,7 @@ name: 'Release' on: push: - # take no actions on push... + # take no actions on push to any branch... branches-ignore: - '**' # ... only act on release tags @@ -16,12 +16,12 @@ jobs: - uses: actions/checkout@v2 - # we don't want to release commits that have been pushed and tagged, but not necessarily merged onto master - - name: Ensure tagged commit is on master + # we don't want to release commits that have been pushed and tagged, but not necessarily merged onto main + - name: Ensure tagged commit is on main run: | echo "Tag: ${GITHUB_REF##*/}" - git fetch origin master - git merge-base --is-ancestor ${GITHUB_REF##*/} origin/master && echo "${GITHUB_REF##*/} is a commit on master!" + git fetch origin main + git merge-base --is-ancestor ${GITHUB_REF##*/} origin/main && echo "${GITHUB_REF##*/} is a commit on main!" - name: Build snapshot artifacts uses: fountainhead/action-wait-for-check@v1.0.0