This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-avatica-go.git
The following commit(s) were added to refs/heads/main by this push:
new 463c0cb [CALCITE-4147] Rename "master" branch to "main"
463c0cb is described below
commit 463c0cbf8ab7a1af93d44cd9ba33df078fe3d3dc
Author: Francis Chuang <[email protected]>
AuthorDate: Thu Apr 21 11:31:43 2022 +1000
[CALCITE-4147] Rename "master" branch to "main"
---
.github/workflows/publish-website.yml | 4 ++--
docker.sh | 8 ++++----
site/README.md | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/publish-website.yml
b/.github/workflows/publish-website.yml
index 36add65..fee19d8 100644
--- a/.github/workflows/publish-website.yml
+++ b/.github/workflows/publish-website.yml
@@ -21,7 +21,7 @@ on:
tags:
- v[0-9]+.[0-9]+.[0-9]+ # Trigger if a tag matching
vX.Y.Z is pushed
branches:
- - master # or if there is a push to
master
+ - main # or if there is a push to main
paths:
- 'site/**' # and files in the site/ folder
are changed
- '!site/_docs/go_client_reference.md' # except for
site/_docs/go_client_reference.md
@@ -61,4 +61,4 @@ jobs:
git checkout -- avatica/javadocAggregate/
git add .
git commit -m "Website deployed from calcite-avatica-go@$GITHUB_SHA"
- git push origin master
+ git push origin main
diff --git a/docker.sh b/docker.sh
index 90350cd..4e640df 100755
--- a/docker.sh
+++ b/docker.sh
@@ -205,10 +205,10 @@ check_if_tag_exists(){
check_local_remote_are_even(){
REMOTE_COMMIT=$(git ls-remote $GITBOX_URL | head -1 | sed
"s/[[:space:]]HEAD//")
- LOCAL_COMMIT=$(git rev-parse master)
+ LOCAL_COMMIT=$(git rev-parse main)
if [[ $REMOTE_COMMIT != $LOCAL_COMMIT ]]; then
- echo "Master in Apache repository is not even with local master"
+ echo "Main branch in Apache repository is not even with local branch
main"
exit 1
fi
}
@@ -289,8 +289,8 @@ make_release_artifacts(){
CURRENT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
- if [ $CURRENT_BRANCH != "master" ]; then
- echo "You are currently on the $CURRENT_BRANCH branch. A release must
be made from the master branch. Exiting..."
+ if [ $CURRENT_BRANCH != "main" ]; then
+ echo "You are currently on the $CURRENT_BRANCH branch. A release must
be made from the main branch. Exiting..."
exit 1
fi
diff --git a/site/README.md b/site/README.md
index d6b8593..203d457 100644
--- a/site/README.md
+++ b/site/README.md
@@ -25,4 +25,4 @@ It is symlinked and built by the [Avatica web
site](https://calcite.apache.org/a
a sub-directory of the [Apache Calcite web site](https://calcite.apache.org).
The web pages are pulled by the Apache Calcite Avatica project when building
the Avatica site and is automatically
-built and published following the process outlined in the [Calcite
repository](https://github.com/apache/calcite/blob/master/site/README.md).
\ No newline at end of file
+built and published following the process outlined in the [Calcite
repository](https://github.com/apache/calcite/blob/main/site/README.md).
\ No newline at end of file
