From 178497c1e454009b5727588c666f5619a84a1c18 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 22 Sep 2021 09:25:12 +0200 Subject: [PATCH] master -> main (#945) --- .github/workflows/checks.yml | 2 +- .github/workflows/integration-tests-kube-api.yml | 2 +- .github/workflows/integration-tests-kube-dns.yml | 2 +- .github/workflows/integration-tests-lease.yml | 2 +- .github/workflows/integration-tests-maven.yml | 2 +- .github/workflows/release-drafter.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/unit-tests.yml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 232a6d367..304fd40b4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - release-* tags-ignore: [ v.* ] diff --git a/.github/workflows/integration-tests-kube-api.yml b/.github/workflows/integration-tests-kube-api.yml index 3b9a37ca8..cb56171d3 100644 --- a/.github/workflows/integration-tests-kube-api.yml +++ b/.github/workflows/integration-tests-kube-api.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - release-* tags-ignore: [ v.* ] schedule: diff --git a/.github/workflows/integration-tests-kube-dns.yml b/.github/workflows/integration-tests-kube-dns.yml index ef0ee7431..817b4a0c4 100644 --- a/.github/workflows/integration-tests-kube-dns.yml +++ b/.github/workflows/integration-tests-kube-dns.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - release-* tags-ignore: [ v.* ] schedule: diff --git a/.github/workflows/integration-tests-lease.yml b/.github/workflows/integration-tests-lease.yml index 498e42ee1..98e02478e 100644 --- a/.github/workflows/integration-tests-lease.yml +++ b/.github/workflows/integration-tests-lease.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - release-* tags-ignore: [ v.* ] schedule: diff --git a/.github/workflows/integration-tests-maven.yml b/.github/workflows/integration-tests-maven.yml index dcedafad4..79eadebb3 100644 --- a/.github/workflows/integration-tests-maven.yml +++ b/.github/workflows/integration-tests-maven.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - release-* tags-ignore: [ v.* ] # Different than its sibilings, we don't configure this workflow to run as a cron job. diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 306d251ee..640600024 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,14 +4,14 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - master + - main - release-* jobs: update_release_draft: runs-on: ubuntu-latest steps: - # Drafts your next Release notes as Pull Requests are merged into "master" + # Drafts your next Release notes as Pull Requests are merged into "main" - uses: raboof/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22fdea398..de61daa83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - master + - main - release-* tags: ["*"] diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 7de2e0dce..f09a04153 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - release-* tags-ignore: [ v.* ] schedule: @@ -52,4 +52,4 @@ jobs: - name: Print logs on failure if: ${{ failure() }} - run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \; \ No newline at end of file + run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;