From 03a0498bca0a7a83ea70ffe8941dc141d8fd8d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= Date: Mon, 2 Oct 2023 21:52:59 +0200 Subject: [PATCH] AVRO-3878: Rename default git branch to be 'main' --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/dependabot.yml | 1 - .github/workflows/codeql-csharp-analysis.yml | 4 ++-- .github/workflows/codeql-java-analysis.yml | 4 ++-- .github/workflows/codeql-js-analysis.yml | 4 ++-- .github/workflows/codeql-py-analysis.yml | 4 ++-- .github/workflows/java-publish-snapshot.yml | 2 +- .github/workflows/maven4.yml | 4 ++-- .github/workflows/rat.yml | 4 ++-- .github/workflows/spotless.yml | 4 ++-- .github/workflows/test-lang-c++.yml | 4 ++-- .github/workflows/test-lang-c.yml | 4 ++-- .github/workflows/test-lang-csharp.yml | 4 ++-- .github/workflows/test-lang-java.yml | 4 ++-- .github/workflows/test-lang-js.yml | 4 ++-- .github/workflows/test-lang-perl.yml | 4 ++-- .github/workflows/test-lang-php.yml | 4 ++-- .github/workflows/test-lang-py.yml | 4 ++-- .github/workflows/test-lang-ruby.yml | 4 ++-- .github/workflows/test-lang-rust-audit.yml | 4 ++-- .github/workflows/test-lang-rust-ci.yml | 4 ++-- .github/workflows/test-lang-rust-clippy.yml | 4 ++-- 22 files changed, 40 insertions(+), 41 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 87da2294fe4..2823e406003 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -13,7 +13,7 @@ - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review. - - Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/master/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests). + - Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/main/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests). - Each pull request should address only one issue, not mix up code from multiple issues. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0059d8f55a3..14d2f29b768 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -84,7 +84,6 @@ updates: schedule: interval: "daily" open-pull-requests-limit: 20 - target-branch: master - package-ecosystem: "github-actions" directory: "/" diff --git a/.github/workflows/codeql-csharp-analysis.yml b/.github/workflows/codeql-csharp-analysis.yml index 58f9c1404f3..c140a6e91ab 100644 --- a/.github/workflows/codeql-csharp-analysis.yml +++ b/.github/workflows/codeql-csharp-analysis.yml @@ -23,11 +23,11 @@ name: "CodeQL C#" on: push: branches: - - master + - main pull_request: # The branches below must be a subset of the branches above branches: - - master + - main paths: - .github/workflows/codeql-csharp-analysis.yml - lang/csharp/** diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml index 7c2b7b87c61..8fe8d1060eb 100644 --- a/.github/workflows/codeql-java-analysis.yml +++ b/.github/workflows/codeql-java-analysis.yml @@ -23,10 +23,10 @@ on: workflow_dispatch: push: branches: - - master + - main pull_request: branches: - - master + - main paths: - .github/workflows/codeql-java-analysis.yml - lang/java/** diff --git a/.github/workflows/codeql-js-analysis.yml b/.github/workflows/codeql-js-analysis.yml index bb91cc0901d..98f27bde6f4 100644 --- a/.github/workflows/codeql-js-analysis.yml +++ b/.github/workflows/codeql-js-analysis.yml @@ -23,11 +23,11 @@ name: "CodeQL JavaScript" on: push: branches: - - master + - main pull_request: # The branches below must be a subset of the branches above branches: - - master + - main paths: - .github/workflows/codeql-js-analysis.yml - lang/js/** diff --git a/.github/workflows/codeql-py-analysis.yml b/.github/workflows/codeql-py-analysis.yml index 9e2580d3ead..0fecf34c0e7 100644 --- a/.github/workflows/codeql-py-analysis.yml +++ b/.github/workflows/codeql-py-analysis.yml @@ -23,11 +23,11 @@ name: "CodeQL Python" on: push: branches: - - master + - main pull_request: # The branches below must be a subset of the branches above branches: - - master + - main paths: - .github/workflows/codeql-py-analysis.yml - lang/py/** diff --git a/.github/workflows/java-publish-snapshot.yml b/.github/workflows/java-publish-snapshot.yml index 279a0aff4bc..09e92d45c1f 100644 --- a/.github/workflows/java-publish-snapshot.yml +++ b/.github/workflows/java-publish-snapshot.yml @@ -19,7 +19,7 @@ name: "Publish Snapshot to Maven" on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/java-publish-snapshot.yml - lang/java/** diff --git a/.github/workflows/maven4.yml b/.github/workflows/maven4.yml index b939cd1254c..39663c4a802 100644 --- a/.github/workflows/maven4.yml +++ b/.github/workflows/maven4.yml @@ -17,9 +17,9 @@ name: 'Maven 4' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/maven4.yml - lang/java/** diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml index 7ae41115ae3..cf09ad68dc9 100644 --- a/.github/workflows/rat.yml +++ b/.github/workflows/rat.yml @@ -17,9 +17,9 @@ name: 'Rat' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index 4f5a14a4257..29dfa0016f0 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -17,9 +17,9 @@ name: 'Spotless' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/spotless.yml - lang/java/** diff --git a/.github/workflows/test-lang-c++.yml b/.github/workflows/test-lang-c++.yml index 9f3b61c583b..5747a0da361 100644 --- a/.github/workflows/test-lang-c++.yml +++ b/.github/workflows/test-lang-c++.yml @@ -17,9 +17,9 @@ name: Test C++ on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - '.github/workflows/test-lang-c\+\+.yml' - 'lang/c\+\+/**' diff --git a/.github/workflows/test-lang-c.yml b/.github/workflows/test-lang-c.yml index a32fff9dc96..877ff7f5f1b 100644 --- a/.github/workflows/test-lang-c.yml +++ b/.github/workflows/test-lang-c.yml @@ -17,9 +17,9 @@ name: Test C on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-c.yml - lang/c/** diff --git a/.github/workflows/test-lang-csharp.yml b/.github/workflows/test-lang-csharp.yml index 579e5c30b3e..db370df599f 100644 --- a/.github/workflows/test-lang-csharp.yml +++ b/.github/workflows/test-lang-csharp.yml @@ -17,9 +17,9 @@ name: 'Test C#' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-csharp.yml - lang/csharp/** diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index a4920b4a009..89997300ec1 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -17,9 +17,9 @@ name: 'Test Java' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-java.yml - lang/java/** diff --git a/.github/workflows/test-lang-js.yml b/.github/workflows/test-lang-js.yml index f3cc6bca4ed..cbc56a29c22 100644 --- a/.github/workflows/test-lang-js.yml +++ b/.github/workflows/test-lang-js.yml @@ -17,9 +17,9 @@ name: 'Test JavaScript' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-js.yml - lang/js/** diff --git a/.github/workflows/test-lang-perl.yml b/.github/workflows/test-lang-perl.yml index 601d09818b7..c30599b7537 100644 --- a/.github/workflows/test-lang-perl.yml +++ b/.github/workflows/test-lang-perl.yml @@ -17,9 +17,9 @@ name: 'Test Perl' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-perl.yml - lang/perl/** diff --git a/.github/workflows/test-lang-php.yml b/.github/workflows/test-lang-php.yml index 7082b9838bf..f4e9ae42f6b 100644 --- a/.github/workflows/test-lang-php.yml +++ b/.github/workflows/test-lang-php.yml @@ -17,9 +17,9 @@ name: 'Test PHP' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-php.yml - lang/php/** diff --git a/.github/workflows/test-lang-py.yml b/.github/workflows/test-lang-py.yml index 498d8a84ba9..e037a848e34 100644 --- a/.github/workflows/test-lang-py.yml +++ b/.github/workflows/test-lang-py.yml @@ -17,9 +17,9 @@ name: 'Test Python' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-py.yml - lang/py/** diff --git a/.github/workflows/test-lang-ruby.yml b/.github/workflows/test-lang-ruby.yml index bd5ed6c9b92..786bb5ce0ad 100644 --- a/.github/workflows/test-lang-ruby.yml +++ b/.github/workflows/test-lang-ruby.yml @@ -17,9 +17,9 @@ name: 'Test Ruby' on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-ruby.yml - lang/ruby/** diff --git a/.github/workflows/test-lang-rust-audit.yml b/.github/workflows/test-lang-rust-audit.yml index 9ca10b0b538..d530f8ce6ff 100644 --- a/.github/workflows/test-lang-rust-audit.yml +++ b/.github/workflows/test-lang-rust-audit.yml @@ -19,9 +19,9 @@ name: Rust Security Audit on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-rust-audit.yml - lang/rust/Cargo.toml diff --git a/.github/workflows/test-lang-rust-ci.yml b/.github/workflows/test-lang-rust-ci.yml index 5993cd59025..b2f7425ba65 100644 --- a/.github/workflows/test-lang-rust-ci.yml +++ b/.github/workflows/test-lang-rust-ci.yml @@ -19,9 +19,9 @@ name: Rust Continuous Integration on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-rust-ci.yml - lang/rust/** diff --git a/.github/workflows/test-lang-rust-clippy.yml b/.github/workflows/test-lang-rust-clippy.yml index e0287863160..b8c6fe90dbe 100644 --- a/.github/workflows/test-lang-rust-clippy.yml +++ b/.github/workflows/test-lang-rust-clippy.yml @@ -19,9 +19,9 @@ name: Rust Clippy Check on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] paths: - .github/workflows/test-lang-rust-clippy.yml - lang/rust/**