You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2020/09/13 15:35:45 UTC
[yetus] branch main updated: YETUS-986. Switch development branch
to 'main' (#122)
This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new 906a220 YETUS-986. Switch development branch to 'main' (#122)
906a220 is described below
commit 906a2202ae72e2249233ac89588c6e5d48cbc3e8
Author: Allen Wittenauer <aw...@apache.org>
AuthorDate: Sun Sep 13 08:35:35 2020 -0700
YETUS-986. Switch development branch to 'main' (#122)
Signed-off-by: Sean Busbey <bu...@apache.org>
---
.circleci/config.yml | 2 +-
.cirrus.yml | 2 +-
.github/workflows/yetus.yml | 2 +-
.gitlab-ci.yml | 2 +-
.semaphore/semaphore-build.sh | 2 +-
.travis.yml | 2 +-
Dockerfile | 2 +-
Jenkinsfile | 6 +--
README.md | 2 +-
asf-site-src/Dockerfile | 2 +-
asf-site-src/source/contribute/releases.html.md | 46 +++++++++++-----------
asf-site-src/source/contribute/website.html.md | 10 ++---
.../in-progress/precommit-advanced.html.md | 4 +-
.../in-progress/precommit-basic.html.md | 4 +-
.../in-progress/precommit-robots.html.md | 18 ++++-----
.../in-progress/precommit-testformats.html.md | 2 +-
asf-site-src/source/downloads.html.md.erb | 2 +-
asf-site-src/source/yetus-docker-image.html.md | 2 +-
precommit/src/main/shell/core.d/01-common.sh | 2 +-
precommit/src/main/shell/personality/yetus.sh | 2 +-
precommit/src/main/shell/test-patch.d/jira.sh | 2 +-
precommit/src/main/shell/test-patch.sh | 2 +-
start-build-env.sh | 6 +--
23 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0542782..1dc6731 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ version: 2
jobs:
build:
docker:
- - image: apache/yetus:master
+ - image: apache/yetus:main
working_directory: ~/repo
diff --git a/.cirrus.yml b/.cirrus.yml
index c4d5300..6d1c149 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -17,7 +17,7 @@
yetus_task:
container:
- image: apache/yetus:master
+ image: apache/yetus:main
test_script: >
${CIRRUS_WORKING_DIR}/precommit/src/main/shell/test-patch.sh
--plugins=all
diff --git a/.github/workflows/yetus.yml b/.github/workflows/yetus.yml
index 03396ee..1b76f06 100644
--- a/.github/workflows/yetus.yml
+++ b/.github/workflows/yetus.yml
@@ -47,7 +47,7 @@ jobs:
--archive-list="checkstyle-errors.xml,spotbugsXml.xml"
--plugins=all
--tests-filter=checkstyle,javadoc,rubocop,test4tests
- --docker-cache-from=apache/yetus-base:master
+ --docker-cache-from=apache/yetus-base:main
- name: Artifact output
if: ${{ always() }}
uses: actions/upload-artifact@v2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 354bfb2..91b71a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@
---
buretoolbox-job:
- image: apache/yetus:master
+ image: apache/yetus:main
allow_failure: true
script:
- >
diff --git a/.semaphore/semaphore-build.sh b/.semaphore/semaphore-build.sh
index 351969c..e861676 100755
--- a/.semaphore/semaphore-build.sh
+++ b/.semaphore/semaphore-build.sh
@@ -26,4 +26,4 @@ PRECOMMITDIR=precommit/src/main/shell
--docker \
--pylint=pylint2 \
--dockerfile="${PRECOMMITDIR}/test-patch-docker/Dockerfile" \
- --docker-cache-from=apache/yetus-base:master,ubuntu:xenial
+ --docker-cache-from=apache/yetus-base:main,ubuntu:focal
diff --git a/.travis.yml b/.travis.yml
index f2ecccb..8afd242 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
--java-home=/usr/lib/jvm/java-8-openjdk-amd64
--plugins=all
--pylint=pylint2
- --docker-cache-from=apache/yetus:master
+ --docker-cache-from=apache/yetus:main
--html-report-file=/tmp/yetus-out/report.html
--console-report-file=/tmp/yetus-out/console.txt
--brief-report-file=/tmp/yetus-out/brief.txt
diff --git a/Dockerfile b/Dockerfile
index 0884599..0e417a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG DOCKER_TAG=master
+ARG DOCKER_TAG=main
ARG DOCKER_REPO=apache/yetus
FROM ${DOCKER_REPO}-base:${DOCKER_TAG}
diff --git a/Jenkinsfile b/Jenkinsfile
index a7133c0..4713f28 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -180,10 +180,10 @@ pipeline {
# run in docker mode and specifically point to our
# Dockerfile since we don't want to use the auto-pulled version.
if [[ "${USE_DOCKER_FLAG}" == true ]]; then
- docker pull ubuntu:xenial
+ docker pull ubuntu:focal
YETUS_ARGS+=("--docker")
YETUS_ARGS+=("--dockerfile=${YETUS_DOCKERFILE}")
- YETUS_ARGS+=("--docker-cache-from=apache/yetus-base:master")
+ YETUS_ARGS+=("--docker-cache-from=apache/yetus-base:main")
else
# need to figure this out programmatically; hard-coded for now
export JAVA_HOME=/home/jenkins/tools/java/latest1.8
@@ -224,7 +224,7 @@ pipeline {
reportFiles: 'report.html',
reportName: 'Yetus Report'
])
- if ((env.BRANCH_NAME == 'master') && (env.BUILD_URL.contains('apache.org'))) {
+ if ((env.BRANCH_NAME == 'main') && (env.BUILD_URL.contains('apache.org'))) {
emailext(subject: '$DEFAULT_SUBJECT',
body:
'''For more details, see ${BUILD_URL}
diff --git a/README.md b/README.md
index 94bc0ab..1c31819 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ After executing one or more of the Apache Maven commands, artifacts will be in `
## Container Quickstart
-The project makes available two convenience container images on <https://hub.docker.com> for both tagged releases and for the master branch. It is highly recommended that casual users use a tagged release so as to not be surprised by incompatible changes that are still rolling through the master branch.
+The project makes available two convenience container images on <https://hub.docker.com> for both tagged releases and for the main branch. It is highly recommended that casual users use a tagged release so as to not be surprised by incompatible changes that are still rolling through the main branch.
### apache/yetus-base
diff --git a/asf-site-src/Dockerfile b/asf-site-src/Dockerfile
index 763c562..41f82e9 100644
--- a/asf-site-src/Dockerfile
+++ b/asf-site-src/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG DOCKER_TAG=master
+ARG DOCKER_TAG=main
ARG DOCKER_REPO=apache/yetus
FROM ${DOCKER_REPO}-build:${DOCKER_TAG}
diff --git a/asf-site-src/source/contribute/releases.html.md b/asf-site-src/source/contribute/releases.html.md
index 675b206..19128ef 100644
--- a/asf-site-src/source/contribute/releases.html.md
+++ b/asf-site-src/source/contribute/releases.html.md
@@ -118,24 +118,24 @@ Like the rest of our project activity, we'll use an issue in JIRA to track manag
### Work in Git
-Once you have an issue to track things, you can create the git branch for staging our release. This separate branch will allow you to polish the release while regular work continues on the master branch. You will need to update master for the next SNAPSHOT version and the branch for the release.
+Once you have an issue to track things, you can create the git branch for staging our release. This separate branch will allow you to polish the release while regular work continues on the main branch. You will need to update main for the next SNAPSHOT version and the branch for the release.
Example commands, presuming the release under management is **0.7.0** and the JIRA issue is **YETUS-XXX**:
```bash
-$ # Ensure master is up to date
+$ # Ensure main is up to date
$ mvn clean
$ git fetch origin
$ git status
-# On branch master
-# Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
+# On branch main
+# Your branch is behind 'origin/main' by 6 commits, and can be fast-forwarded.
#
nothing to commit (working directory clean)
-$ git rebase origin/master
+$ git rebase origin/main
First, rewinding head to replay your work on top of it...
-Fast-forwarded master to origin/master.
+Fast-forwarded main to origin/main.
$ git status
-# On branch master
+# On branch main
nothing to commit (working directory clean)
$ # create a branch and push without changes
$ git checkout -b YETUS-XXX
@@ -162,13 +162,13 @@ At this point, you should edit the files mentioned above. They must have the ver
$ perl -pi -e 's,0.7.0-SNAPSHOT,0.7.0,g' $(find . -type f)
```
-After you are done, create a branch-specific patch and then prepare to update the master branch.
+After you are done, create a branch-specific patch and then prepare to update the main branch.
```bash
$ git add -p
$ git commit -m "YETUS-XXX. Stage version 0.7.0."
$ git format-patch --stdout origin/YETUS-XXX > path/to/patches/YETUS-XXX-YETUS-XXX.1.patch
-$ git checkout master
+$ git checkout main
$ grep -rl "0.7.0-SNAPSHOT" * 2>/dev/null
asf-site-src/pom.xml
audience-annotations-component/audience-annotations/pom.xml
@@ -193,8 +193,8 @@ After you are done, create a patch.
```bash
$ git add -p
-$ git commit -m "YETUS-XXX. bump master version to 0.8.0-SNAPSHOT"
-$ git format-patch --stdout origin/master > path/to/patches/YETUS-XXX.1.patch
+$ git commit -m "YETUS-XXX. bump main version to 0.8.0-SNAPSHOT"
+$ git format-patch --stdout origin/main > path/to/patches/YETUS-XXX.1.patch
```
Both of these patch files should be uploaded to your release issue for review. Push them to the repository once the patches get approval.
@@ -396,20 +396,20 @@ If you've gone through all of the ASF required checks, you'll already have made
| | | | tags.
| +1 | test4tests | 0m 0s | The patch appears to include 2 new or
| | | | modified test files.
- | +1 | mvninstall | 4m 41s | master passed
- | +1 | compile | 1m 4s | master passed with JDK v1.8.0_72
- | +1 | compile | 0m 57s | master passed with JDK v1.7.0_95
- | +1 | checkstyle | 0m 36s | master passed
- | +1 | mvneclipse | 0m 35s | master passed
- | -1 | findbugs | 1m 6s | hbase-client in master has 19 extant
+ | +1 | mvninstall | 4m 41s | main passed
+ | +1 | compile | 1m 4s | main passed with JDK v1.8.0_72
+ | +1 | compile | 0m 57s | main passed with JDK v1.7.0_95
+ | +1 | checkstyle | 0m 36s | main passed
+ | +1 | mvneclipse | 0m 35s | main passed
+ | -1 | findbugs | 1m 6s | hbase-client in main has 19 extant
| | | | Findbugs warnings.
- | -1 | findbugs | 2m 8s | hbase-server in master has 84 extant
+ | -1 | findbugs | 2m 8s | hbase-server in main has 84 extant
| | | | Findbugs warnings.
- | -1 | javadoc | 0m 23s | hbase-client in master failed with JDK
+ | -1 | javadoc | 0m 23s | hbase-client in main failed with JDK
| | | | v1.8.0_72.
- | -1 | javadoc | 0m 34s | hbase-server in master failed with JDK
+ | -1 | javadoc | 0m 34s | hbase-server in main failed with JDK
| | | | v1.8.0_72.
- | +1 | javadoc | 0m 57s | master passed with JDK v1.7.0_95
+ | +1 | javadoc | 0m 57s | main passed with JDK v1.7.0_95
| +1 | mvninstall | 1m 3s | the patch passed
| +1 | compile | 0m 59s | the patch passed with JDK v1.8.0_72
| +1 | javac | 0m 59s | the patch passed
@@ -453,7 +453,7 @@ If you've gone through all of the ASF required checks, you'll already have made
| uname | Linux 67e02eb9aeea 3.13.0-36-lowlatency #63-Ubuntu SMP PREEMPT Wed Sep 3 21:56:12 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux |
| Build tool | maven |
| Personality | /testptch/patchprocess/precommit/personality/hbase.sh |
- | git revision | master / 81a6fff |
+ | git revision | main / 81a6fff |
| findbugs | v2.0.1 |
| findbugs | /testptch/patchprocess/branch-findbugs-hbase-client-warnings.html |
| findbugs | /testptch/patchprocess/branch-findbugs-hbase-server-warnings.html |
@@ -568,7 +568,7 @@ Once a release candidate obtains majority approval from the PMC, there are sever
$ brew upgrade --build-from-source Formula/yetus.rb
```
-1. Update the documentation in the git master branch for the new release. Remove the oldest release and add the latest.
+1. Update the documentation in the git main branch for the new release. Remove the oldest release and add the latest.
```bash
$ cd asf-site-src
diff --git a/asf-site-src/source/contribute/website.html.md b/asf-site-src/source/contribute/website.html.md
index a5e0578..550daee 100644
--- a/asf-site-src/source/contribute/website.html.md
+++ b/asf-site-src/source/contribute/website.html.md
@@ -102,8 +102,8 @@ $ git clone --single-branch --branch asf-site https://github.com/apache/yetus.gi
$ # Now build in the normal yetus check out
$ cd yetus
$ git fetch origin
-$ git checkout master
-$ git reset --hard origin/master
+$ git checkout main
+$ git reset --hard origin/main
$ git clean -xdf
$ mvn --batch-mode install
$ mvn --batch-mode site site:stage
@@ -113,11 +113,11 @@ $ # check the set of differences
$ git add -p
$ # Verify any new files are also added
$ git status
-$ # Try to reference the commit hash on master that this publication assures we include
+$ # Try to reference the commit hash on main that this publication assures we include
$ git commit -m "git hash 6c6f6f6b696e6720746f6f20686172642c20796f"
$ # Finally publish
$ git push origin asf-site
```
-Publishing the website should be possible from the HEAD of the master branch under most circumstances. (See the [Guide for Release Managing](releases) for a notable time period where this won't be true.)
-Documentation changes will be reviewed as they make their way into the master branch; updates to the `asf-site` branch are handled without further review.
+Publishing the website should be possible from the HEAD of the main branch under most circumstances. (See the [Guide for Release Managing](releases) for a notable time period where this won't be true.)
+Documentation changes will be reviewed as they make their way into the main branch; updates to the `asf-site` branch are handled without further review.
diff --git a/asf-site-src/source/documentation/in-progress/precommit-advanced.html.md b/asf-site-src/source/documentation/in-progress/precommit-advanced.html.md
index a30f006..919254d 100644
--- a/asf-site-src/source/documentation/in-progress/precommit-advanced.html.md
+++ b/asf-site-src/source/documentation/in-progress/precommit-advanced.html.md
@@ -155,7 +155,7 @@ Globals for personalities should be defined in the `personality_globals` functio
```bash
function personality_globals
{
- PATCH_BRANCH_DEFAULT=master
+ PATCH_BRANCH_DEFAULT=main
GITHUB_REPO="apache/yetus"
}
```
@@ -273,7 +273,7 @@ There are a handful of extremely important system variables that make life easie
* MODULE and other MODULE\_\* are arrays that contain which modules, the status, etc, to be operated upon. These should be treated as read-only by plug-ins.
-* PATCH\_BRANCH\_DEFAULT is the name of the branch in the git repo that is considered the master. This is useful to set in personalities.
+* PATCH\_BRANCH\_DEFAULT is the name of the branch in the git repo that is considered the primary development branch (e.g., 'main'). This is useful to set in personalities.
* PATCH\_DIR is the name of the temporary directory that houses test-patch artifacts (such as logs and the patch file itself)
diff --git a/asf-site-src/source/documentation/in-progress/precommit-basic.html.md b/asf-site-src/source/documentation/in-progress/precommit-basic.html.md
index 6c8ef15..669397b 100644
--- a/asf-site-src/source/documentation/in-progress/precommit-basic.html.md
+++ b/asf-site-src/source/documentation/in-progress/precommit-basic.html.md
@@ -143,7 +143,7 @@ A typical local configuration is to have two repositories. One with the code yo
```bash
$ cd <workrepo>
-$ git format-patch master > /tmp/patchfile
+$ git format-patch main > /tmp/patchfile
$ test-patch --basedir=/some/path/testrepo /tmp/patchfile
```
@@ -158,7 +158,7 @@ After running that command, the test repository will contain the remnants of the
```bash
$ cd <workrepo>
-$ git format-patch master > /tmp/patchfile
+$ git format-patch main > /tmp/patchfile
$ test-patch --basedir=/some/path/testrepo --resetrepo /tmp/patchfile
```
diff --git a/asf-site-src/source/documentation/in-progress/precommit-robots.html.md b/asf-site-src/source/documentation/in-progress/precommit-robots.html.md
index 816baa4..80fcd54 100644
--- a/asf-site-src/source/documentation/in-progress/precommit-robots.html.md
+++ b/asf-site-src/source/documentation/in-progress/precommit-robots.html.md
@@ -98,7 +98,7 @@ jobs:
See also:
-* Apache Yetus' source tree [.circleci/config.yaml](https://github.com/apache/yetus/blob/master/.circleci/config.yml) for some tips and tricks.
+* Apache Yetus' source tree [.circleci/config.yaml](https://github.com/apache/yetus/blob/main/.circleci/config.yml) for some tips and tricks.
# Cirrus CI
@@ -131,7 +131,7 @@ yetus_task:
See also:
-* Apache Yetus' source tree [.cirrus.yml](https://github.com/apache/yetus/blob/master/.cirrus.yml) for some tips and tricks.
+* Apache Yetus' source tree [.cirrus.yml](https://github.com/apache/yetus/blob/main/.cirrus.yml) for some tips and tricks.
# GitHub Actions
@@ -143,7 +143,7 @@ GitHub Actions support has only been tested on the ubuntu-latest image. It autom
See also:
-* Apache Yetus' source tree [yetus.yaml](https://github.com/apache/yetus/blob/master/.github/workflows/yetus.yml) for some tips and tricks.
+* Apache Yetus' source tree [yetus.yaml](https://github.com/apache/yetus/blob/main/.github/workflows/yetus.yml) for some tips and tricks.
# Gitlab CI
@@ -175,7 +175,7 @@ job:
See also:
-* Apache Yetus' source tree [.gitlab-ci.yml](https://github.com/apache/yetus/blob/master/.gitlab-ci.yml) for some tips and tricks.
+* Apache Yetus' source tree [.gitlab-ci.yml](https://github.com/apache/yetus/blob/main/.gitlab-ci.yml) for some tips and tricks.
# Jenkins
@@ -208,7 +208,7 @@ pipeline {
```
-Experience has shown that certain Jenkins + Java + OS combinations have problems sending signals to child processes. In the case of Apache Yetus, this may result in aborted or workflows that timeout not being properly killed. `test-patch` will write two files in the patch directory that may be helpful to combat this situation if it applies to your particular configuration. `pidfile.txt` contains the master `test-patch` process id and `cidfile.txt` contains the docker container id. Th [...]
+Experience has shown that certain Jenkins + Java + OS combinations have problems sending signals to child processes. In the case of Apache Yetus, this may result in aborted or workflows that timeout not being properly killed. `test-patch` will write two files in the patch directory that may be helpful to combat this situation if it applies to your particular configuration. `pidfile.txt` contains the main `test-patch` process id and `cidfile.txt` contains the docker container id. Thes [...]
```groovy
post {
@@ -233,7 +233,7 @@ Experience has shown that certain Jenkins + Java + OS combinations have problems
See also:
-* Apache Yetus' source tree [Jenkinsfile](https://github.com/apache/yetus/blob/master/Jenkinsfile) for some tips and tricks.
+* Apache Yetus' source tree [Jenkinsfile](https://github.com/apache/yetus/blob/main/Jenkinsfile) for some tips and tricks.
* [precommit-admin](precommit-admin), for special utilities built for Jenkins.
* [GitHub Branch Source Plugin](https://wiki.jenkins.io/display/JENKINS/GitHub+Branch+Source+Plugin)
* [GitHub Pull Request Builder Plugin](https://wiki.jenkins.io/display/JENKINS/GitHub+pull+request+builder+plugin)
@@ -251,8 +251,8 @@ The GitHub repo and the Pull Request in use are automatically detected. However
See also:
-* Apache Yetus' source tree [semaphore.yml](https://github.com/apache/yetus/blob/master/.semaphore/semaphore.yml) for some tips and tricks.
-* Apache Yetus' helper script [semaphore-build.sh](https://github.com/apache/yetus/blob/master/.semaphore/semaphore-build.sh)
+* Apache Yetus' source tree [semaphore.yml](https://github.com/apache/yetus/blob/main/.semaphore/semaphore.yml) for some tips and tricks.
+* Apache Yetus' helper script [semaphore-build.sh](https://github.com/apache/yetus/blob/main/.semaphore/semaphore-build.sh)
# Travis CI
@@ -268,7 +268,7 @@ As of this writing, it is not possible to make the Travis CI build environment u
See also:
-* Apache Yetus' source tree [.travis.yml](https://github.com/apache/yetus/blob/master/.travis.yml) for some tips and tricks.
+* Apache Yetus' source tree [.travis.yml](https://github.com/apache/yetus/blob/main/.travis.yml) for some tips and tricks.
# Manual Configuration
diff --git a/asf-site-src/source/documentation/in-progress/precommit-testformats.html.md b/asf-site-src/source/documentation/in-progress/precommit-testformats.html.md
index c1bb1ec..172ac81 100644
--- a/asf-site-src/source/documentation/in-progress/precommit-testformats.html.md
+++ b/asf-site-src/source/documentation/in-progress/precommit-testformats.html.md
@@ -45,4 +45,4 @@ Using the results stored by pluginname\_process\_tests, write them to the test r
# Example
-For an example of how to write a test-format plugin, you can look at [junit plugin](https://github.com/apache/yetus/blob/master/precommit/test-patch.d/junit.sh) bundled in Apache Yetus.
+For an example of how to write a test-format plugin, you can look at [junit plugin](https://github.com/apache/yetus/blob/main/precommit/test-patch.d/junit.sh) bundled in Apache Yetus.
diff --git a/asf-site-src/source/downloads.html.md.erb b/asf-site-src/source/downloads.html.md.erb
index 02203ef..a453936 100644
--- a/asf-site-src/source/downloads.html.md.erb
+++ b/asf-site-src/source/downloads.html.md.erb
@@ -62,7 +62,7 @@ This will install many of the dependencies needed for the precommit functionalit
## Helper Script
-To aid in downloading Apache Yetus for continuous integration systems, local build environments, etc, we provide a simple script that may be checked into your local repo [here](https://raw.githubusercontent.com/apache/yetus/master/yetus-dl.sh). It takes two parameters:
+To aid in downloading Apache Yetus for continuous integration systems, local build environments, etc, we provide a simple script that may be checked into your local repo [here](https://raw.githubusercontent.com/apache/yetus/main/yetus-dl.sh). It takes two parameters:
```bash
$ yetus-dl.sh <location> <version>
diff --git a/asf-site-src/source/yetus-docker-image.html.md b/asf-site-src/source/yetus-docker-image.html.md
index 822b9f0..1bc4242 100644
--- a/asf-site-src/source/yetus-docker-image.html.md
+++ b/asf-site-src/source/yetus-docker-image.html.md
@@ -38,7 +38,7 @@ While not official releases, the Apache Yetus project makes available two types
Both images should be suitable to be used as a building block or even directly if your build environment needs no other dependencies. These images are especially useful for various CI systems that require a Docker image to be used.
-Images are tagged such that 'master' represents the last successful Docker image build of the master branch. Images based off of the official source releases are tagged with a matching version number (e.g., 0.9.0). There is no 'latest' tagged image. It is recommended that users choose a stable tag so as not to be surprised by incompatible changes.
+Images are tagged such that 'main' represents the last successful Docker image build of the main branch. Images based off of the official source releases are tagged with a matching version number (e.g., 0.9.0). There is no 'latest' tagged image. It is recommended that users choose a stable tag so as not to be surprised by incompatible changes.
# File Access
diff --git a/precommit/src/main/shell/core.d/01-common.sh b/precommit/src/main/shell/core.d/01-common.sh
index 79d9fcd..9d86170 100755
--- a/precommit/src/main/shell/core.d/01-common.sh
+++ b/precommit/src/main/shell/core.d/01-common.sh
@@ -44,7 +44,7 @@ function common_defaults
OSTYPE=$(uname -s)
#shellcheck disable=SC2034
PATCH_BRANCH=""
- PATCH_BRANCH_DEFAULT="master"
+ PATCH_BRANCH_DEFAULT="main"
#shellcheck disable=SC2034
PATCH_DRYRUNMODE=false
PATCH_DIR=/tmp
diff --git a/precommit/src/main/shell/personality/yetus.sh b/precommit/src/main/shell/personality/yetus.sh
index 24c1815..3efa1e2 100755
--- a/precommit/src/main/shell/personality/yetus.sh
+++ b/precommit/src/main/shell/personality/yetus.sh
@@ -24,7 +24,7 @@ function personality_globals
# shellcheck disable=SC2034
BUILDTOOL=maven
#shellcheck disable=SC2034
- PATCH_BRANCH_DEFAULT=master
+ PATCH_BRANCH_DEFAULT=main
#shellcheck disable=SC2034
JIRA_ISSUE_RE='^YETUS-[0-9]+$'
#shellcheck disable=SC2034
diff --git a/precommit/src/main/shell/test-patch.d/jira.sh b/precommit/src/main/shell/test-patch.d/jira.sh
index 830b9ae..bc5104c 100755
--- a/precommit/src/main/shell/test-patch.d/jira.sh
+++ b/precommit/src/main/shell/test-patch.d/jira.sh
@@ -280,7 +280,7 @@ function jira_determine_branch
# detection since that's almost certainly not
# intended. In other words, if ISSUE-99 is the
# name of a branch, you want to test ISSUE-99
- # against master, not ISSUE-99's branch
+ # against main, not ISSUE-99's branch
if [[ ${hinttype} =~ ${JIRA_ISSUE_RE} ]]; then
continue
fi
diff --git a/precommit/src/main/shell/test-patch.sh b/precommit/src/main/shell/test-patch.sh
index 6d4f40b..b0c1eca 100755
--- a/precommit/src/main/shell/test-patch.sh
+++ b/precommit/src/main/shell/test-patch.sh
@@ -682,7 +682,7 @@ function yetus_usage
yetus_add_option "--archive-list=<list>" "Comma delimited list of pattern matching notations to copy to patch-dir"
yetus_add_option "--basedir=<dir>" "The directory to apply the patch to (default: current directory)"
yetus_add_option "--branch=<ref>" "Forcibly set the branch"
- yetus_add_option "--branch-default=<ref>" "If the branch isn't forced and we don't detect one in the patch name, use this branch (default 'master')"
+ yetus_add_option "--branch-default=<ref>" "If the branch isn't forced and we don't detect one in the patch name, use this branch (default 'main')"
yetus_add_option "--build-native=<bool>" "If true, then build native components (default 'true')"
# shellcheck disable=SC2153
yetus_add_option "--build-tool=<tool>" "Pick which build tool to focus around (default: autodetect from '${buildtools}')"
diff --git a/start-build-env.sh b/start-build-env.sh
index ed26e42..c73d22f 100755
--- a/start-build-env.sh
+++ b/start-build-env.sh
@@ -30,11 +30,11 @@ fi
echo "Attempting a few pulls of ${YETUS_DOCKER_REPO} and ${YETUS_DOCKER_REPO}-base to save time"
echo "Errors here will be ignored!"
-docker pull "${YETUS_DOCKER_REPO}-base:${BRANCH}" || docker pull "${YETUS_DOCKER_REPO}-base:master" || true
-docker pull "${YETUS_DOCKER_REPO}:${BRANCH}" || docker pull "${YETUS_DOCKER_REPO}:master" || true
+docker pull "${YETUS_DOCKER_REPO}-base:${BRANCH}" || docker pull "${YETUS_DOCKER_REPO}-base:main" || true
+docker pull "${YETUS_DOCKER_REPO}:${BRANCH}" || docker pull "${YETUS_DOCKER_REPO}:main" || true
docker build \
- --cache-from="${YETUS_DOCKER_REPO}-base:${BRANCH},${YETUS_DOCKER_REPO}-base:master,${YETUS_DOCKER_REPO}:${BRANCH},${YETUS_DOCKER_REPO}:master" \
+ --cache-from="${YETUS_DOCKER_REPO}-base:${BRANCH},${YETUS_DOCKER_REPO}-base:main,${YETUS_DOCKER_REPO}:${BRANCH},${YETUS_DOCKER_REPO}:main" \
-t "${YETUS_DOCKER_REPO}-build:${BRANCH}" .
USER_NAME=${SUDO_USER:=$USER}