You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by to...@apache.org on 2021/07/15 18:53:59 UTC

[db-jdo] 01/01: Adjust .asf.yaml and GitHub workflows to use 'main' instead of 'master'

This is an automated email from the ASF dual-hosted git repository.

tobous pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 0ef28a37414ef46144ad8fba99b73af9933ffb7a
Author: Tobias Bouschen <to...@googlemail.com>
AuthorDate: Thu Jul 15 20:44:09 2021 +0200

    Adjust .asf.yaml and GitHub workflows to use 'main' instead of 'master'
---
 .asf.yaml                   | 4 ++--
 .github/workflows/build.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 0e0ec9b..05ff8b8 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -22,8 +22,8 @@ github:
     rebase:  true
 
   protected_branches:
-    # rules for the 'master' branch
-    master:
+    # rules for the 'main' branch
+    main:
       # disallows pushing merge commits to the branch
       required_linear_history: true
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca433df..a234d10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,12 +1,12 @@
 # Builds JDO and runs the TCK
 #
-# This workflow is run for every submitted pull request and every push on master
+# This workflow is run for every submitted pull request and every push on the main branch
 name: Build JDO & Run TCK
 
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
 
 jobs: