diff options
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 4 | ||||
| -rwxr-xr-x | hack/get_release_info.sh | 2 | ||||
| -rwxr-xr-x | hack/release.sh | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d32275a39..8a79ade78 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ env: #### Global variables used for all tasks #### # Name of the ultimate destination branch for this CI run, PR or post-merge. - DEST_BRANCH: "master" + DEST_BRANCH: "main" # Overrides default location (/tmp/cirrus) for repo clone GOPATH: &gopath "/var/tmp/go" GOBIN: "${GOPATH}/bin" @@ -25,12 +25,12 @@ export GOPROXY=https://proxy.golang.org GO ?= go COVERAGE_PATH ?= .coverage DESTDIR ?= -EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-master} HEAD) +EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-main} HEAD) HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD PROJECT := github.com/containers/podman -GIT_BASE_BRANCH ?= origin/master +GIT_BASE_BRANCH ?= origin/main GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) GIT_BRANCH_CLEAN ?= $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") LIBPOD_INSTANCE := libpod_dev diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 16eb6735a..9a7bfba8f 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -74,7 +74,7 @@ PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/server.log # Defaults when not running under CI export CI="${CI:-false}" CIRRUS_CI="${CIRRUS_CI:-false}" -DEST_BRANCH="${DEST_BRANCH:-master}" +DEST_BRANCH="${DEST_BRANCH:-main}" CONTINUOUS_INTEGRATION="${CONTINUOUS_INTEGRATION:-false}" CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-podman} # Cirrus only sets $CIRRUS_BASE_SHA properly for PRs, but $EPOCH_TEST_COMMIT diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests index 392136fdb..0124e238e 100755 --- a/contrib/cirrus/pr-should-include-tests +++ b/contrib/cirrus/pr-should-include-tests @@ -16,7 +16,7 @@ fi # HEAD should be good enough, but the CIRRUS envariable allows us to test head=${CIRRUS_CHANGE_IN_REPO:-HEAD} # Base of this PR. Here we absolutely rely on cirrus. -base=$(git merge-base ${DEST_BRANCH:-master} $head) +base=$(git merge-base ${DEST_BRANCH:-main} $head) # This gives us a list of files touched in all commits, e.g. # A foo.c diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 47f3c9405..c46258cd6 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -145,9 +145,9 @@ function _run_swagger() { elif [[ -n "$CIRRUS_TAG" ]]; then upload_bucket="libpod-master-releases" upload_filename="swagger-$CIRRUS_TAG.yaml" - elif [[ "$CIRRUS_BRANCH" == "master" ]]; then + elif [[ "$CIRRUS_BRANCH" == "main" ]]; then upload_bucket="libpod-master-releases" - # readthedocs versioning uses "latest" for "master" (default) branch + # readthedocs versioning uses "latest" for "main" (default) branch upload_filename="swagger-latest.yaml" elif [[ -n "$CIRRUS_BRANCH" ]]; then upload_bucket="libpod-master-releases" diff --git a/hack/get_release_info.sh b/hack/get_release_info.sh index b3e208ac9..e1020e677 100755 --- a/hack/get_release_info.sh +++ b/hack/get_release_info.sh @@ -16,7 +16,7 @@ valid_args() { # `git describe` will never produce a useful version number under all # branches. This is because the podman release process (see `RELEASE_PROCESS.md`) -# tags release versions only on release-branches (i.e. never on master). +# tags release versions only on release-branches (i.e. never on main). # Scraping the version number directly from the source, is the only way # to reliably obtain the number from all the various contexts supported by # the `Makefile`. diff --git a/hack/release.sh b/hack/release.sh index e9eeaa73b..34842de2e 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -61,7 +61,7 @@ dev_version_commit() } git fetch origin && -git checkout -b "bump-${VERSION}" origin/master && +git checkout -b "bump-${VERSION}" origin/main && release_commit && git tag -s -m "version ${VERSION}" "v${VERSION}" && dev_version_commit |