From 40a858ed96294ed686250a947e6fdbaa42e8abf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Thu, 11 Feb 2021 15:27:06 +0100 Subject: [PATCH] Replace master with main in CI and mergify files (#8) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling --- .github/mergify.yml | 2 +- .github/workflows/go.yaml | 6 +++--- .github/workflows/integration-test.yaml | 6 +++--- .github/workflows/release.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 084d9f068c6..ca5b7649f62 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: remove outdated reviews conditions: - - base=master + - base=main actions: dismiss_reviews: {} diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index b53263ea2a0..8a7d6f9dfce 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -2,9 +2,9 @@ name: "Continuous Integration" on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: unit-tests: @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.15 - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 4cb08817590..7f1c852aa52 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -2,9 +2,9 @@ name: Integration tests on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: integration-test: @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.15 - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 206c02421a8..0ef63d06c43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.15 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2