Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename default branch from master to main #621

Merged
merged 1 commit into from
Jan 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ updates:
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: master
target-branch: main
labels: [auto-dependencies]
ignore:
# arrow and datafusion are bumped manually
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ jobs:
- uses: r-lib/actions/pr-fetch@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Rebase on ${{ github.repository }} master
- name: Rebase on ${{ github.repository }} main
run: |
set -ex
git config user.name "$(git log -1 --pretty=format:%an)"
git config user.email "$(git log -1 --pretty=format:%ae)"
git remote add upstream https://github.com/${{ github.repository }}
git fetch --unshallow upstream master
git rebase upstream/master
git fetch --unshallow upstream main
git rebase upstream/main
- uses: r-lib/actions/pr-push@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
18 changes: 9 additions & 9 deletions dev/release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

### Major Release

Ballista typically has major releases from the `master` branch every 4 weeks.
Ballista typically has major releases from the `main` branch every 4 weeks.

## Prerequisite

Expand Down Expand Up @@ -68,7 +68,7 @@ We maintain `CHANGELOG.md` for each sub project so our users know what has been
changed between releases.

The CHANGELOG is managed automatically using
[update_change_log.sh](https://github.com/apache/arrow-ballista/blob/master/dev/release/update_change_log.sh)
[update_change_log.sh](https://github.com/apache/arrow-ballista/blob/main/dev/release/update_change_log.sh)

This script creates a changelog using github PRs and issues based on the labels
associated with them.
Expand All @@ -88,7 +88,7 @@ Checkout the master commit to be released

```
git fetch apache
git checkout apache/master
git checkout apache/main
```

Update version in `ballista/Cargo.toml` to `0.8.0`:
Expand All @@ -105,7 +105,7 @@ git commit -a -m 'Update version'

### Update CHANGELOG.md

Define release branch (e.g. `master`), base version tag (e.g. `0.8.0`) and future version tag (e.g. `0.9.0`). Commits
Define release branch (e.g. `main`), base version tag (e.g. `0.8.0`) and future version tag (e.g. `0.9.0`). Commits
between the base version tag and the release branch will be used to populate the changelog content.

You will need a GitHub Personal Access Token for the following steps. Follow
Expand All @@ -114,7 +114,7 @@ to generate one if you do not already have one.

```bash
# create the changelog
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-ballista.sh master 0.8.0 0.7.0
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-ballista.sh main 0.8.0 0.7.0
# review change log / edit issues and labels if needed, rerun until you are happy with the result
git commit -a -m 'Create changelog for release'
```
Expand All @@ -127,8 +127,8 @@ You can add `invalid` or `development-process` label to exclude items from
release notes. Add `datafusion`, `ballista` and `python` labels to group items
into each sub-project's change log.

Send a PR to get these changes merged into `master` branch. If new commits that
could change the change log content landed in the `master` branch before you
Send a PR to get these changes merged into `main` branch. If new commits that
could change the change log content landed in the `main` branch before you
could merge the PR, you need to rerun the changelog update script to regenerate
the changelog and update the PR accordingly.

Expand All @@ -152,7 +152,7 @@ Using a string such as `0.8.0` as the `<version>`, create and push the tag by ru

```shell
git fetch apache
git tag <version>-<rc> apache/master
git tag <version>-<rc> apache/main
# push tag to Github remote
git push apache <version>
```
Expand Down Expand Up @@ -218,7 +218,7 @@ The `dev/release/verify-release-candidate.sh` is a script in this repository tha
#### If the release is not approved

If the release is not approved, fix whatever the problem is, merge changelog
changes into master if there is any and try again with the next RC number.
changes into main if there is any and try again with the next RC number.

## Finalize the release

Expand Down
2 changes: 1 addition & 1 deletion dev/release/create-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ on the release. The vote will be open for at least 72 hours.
Only votes from PMC members are binding, but all members of the community are
encouraged to test the release and vote with "(non-binding)".

The standard verification procedure is documented at https://github.com/apache/arrow-ballista/blob/master/dev/release/README.md#verifying-release-candidates.
The standard verification procedure is documented at https://github.com/apache/arrow-ballista/blob/main/dev/release/README.md#verifying-release-candidates.

[ ] +1 Release this as Apache Arrow Ballista ${version}
[ ] +0
Expand Down
2 changes: 1 addition & 1 deletion dev/release/update_change_log-ballista.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#

# Usage:
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-ballista.sh master 0.7.0 0.6.0
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-ballista.sh main 0.7.0 0.6.0

RELEASE_BRANCH=$1
RELEASE_TAG=$2
Expand Down
2 changes: 1 addition & 1 deletion dev/release/update_change_log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# under the License.
#

# Adapted from https://github.com/apache/arrow-rs/tree/master/dev/release/update_change_log.sh
# Adapted from https://github.com/apache/arrow-rs/tree/main/dev/release/update_change_log.sh

# invokes the changelog generator from
# https://github.com/github-changelog-generator/github-changelog-generator
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@

html_context = {
"github_user": "apache",
"github_repo": "arrow-datafusion",
"github_version": "master",
"github_repo": "arrow-ballista",
"github_version": "main",
"doc_path": "docs/source",
}

Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ Table of content

community/communication
Issue tracker <https://github.com/apache/arrow-ballista/issues>
Code of conduct <https://github.com/apache/arrow-ballista/blob/master/CODE_OF_CONDUCT.md>
Code of conduct <https://github.com/apache/arrow-ballista/blob/main/CODE_OF_CONDUCT.md>
2 changes: 1 addition & 1 deletion docs/source/user-guide/deployment/docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This will create the following images:

## Start a Cluster

Using the [docker-compose.yml](https://github.com/apache/arrow-ballista/blob/master/docker-compose.yml) from the
Using the [docker-compose.yml](https://github.com/apache/arrow-ballista/blob/main/docker-compose.yml) from the
source repository, run the following command to start a cluster:

```bash
Expand Down