From 8494a5761be1388bfb0f585688efe64b2ef82dd9 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 30 Jan 2021 13:46:56 -0800 Subject: [PATCH] Rename default branch to main (#3140) --- .github/workflows/documentation.yml | 4 ++-- .github/workflows/gradle.yml | 10 +++++----- .github/workflows/lint-format.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- MAINTAINERS.md | 4 ++-- MavenArtifacts.md | 2 +- README.md | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index d3220f431f..61eba15062 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,7 +9,7 @@ jobs: publish: name: "Documentation - Publish" runs-on: ubuntu-latest - if: github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) + if: github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) steps: - uses: actions/checkout@v2 with: @@ -21,7 +21,7 @@ jobs: - name: Set environment variables (Development) run: | echo "TARGET_FOLDER=$BASE_PATH/development" >> $GITHUB_ENV - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' - name: Set environment variables (Tag) run: | echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 01e9aa7103..56b01bfdeb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -71,12 +71,12 @@ jobs: keychain-password: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} if: | matrix.artifact-name == 'macOS' && (github.repository_owner == 'wpilibsuite' && - (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) - name: Set Keychain Lock Timeout run: security set-keychain-settings -lut 3600 if: | matrix.artifact-name == 'macOS' && (github.repository_owner == 'wpilibsuite' && - (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) - name: Set release environment variable run: echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV shell: bash @@ -87,7 +87,7 @@ jobs: run: ./gradlew build -PbuildServer -PdeveloperID=${{ secrets.APPLE_DEVELOPER_ID }} ${{ env.EXTRA_GRADLE_ARGS }} if: | matrix.artifact-name == 'macOS' && (github.repository_owner == 'wpilibsuite' && - (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) - uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact-name }} @@ -136,12 +136,12 @@ jobs: - name: Combine if: | !startsWith(github.ref, 'refs/tags/v') && - github.ref != 'refs/heads/master' + github.ref != 'refs/heads/main' run: cd combiner && ./gradlew publish -Pallwpilib - name: Combine (Master) if: | github.repository_owner == 'wpilibsuite' && - github.ref == 'refs/heads/master' + github.ref == 'refs/heads/main' run: cd combiner && ./gradlew publish -Pallwpilib env: RUN_AZURE_ARTIFACTORY_RELEASE: "TRUE" diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index ca26eb2684..f496f3abac 100644 --- a/.github/workflows/lint-format.yml +++ b/.github/workflows/lint-format.yml @@ -12,7 +12,7 @@ jobs: run: | git fetch --prune --unshallow git checkout -b pr - git branch -f master origin/master + git branch -f main origin/main - name: Set up Python 3.8 uses: actions/setup-python@v2 with: @@ -35,7 +35,7 @@ jobs: run: | git fetch --prune --unshallow git checkout -b pr - git branch -f master origin/master + git branch -f main origin/main - name: Set up Python 3.8 uses: actions/setup-python@v2 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8409c5e6c5..d9c8a056dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to WPILib -So you want to contribute your changes back to WPILib. Great! We have a few contributing rules that will help you make sure your changes will be accepted into the project. Please remember to follow the rules in the [code of conduct](https://github.com/wpilibsuite/allwpilib/blob/master/CODE_OF_CONDUCT.md), and behave with Gracious Professionalism. +So you want to contribute your changes back to WPILib. Great! We have a few contributing rules that will help you make sure your changes will be accepted into the project. Please remember to follow the rules in the [code of conduct](https://github.com/wpilibsuite/allwpilib/blob/main/CODE_OF_CONDUCT.md), and behave with Gracious Professionalism. - [General Contribution Rules](#general-contribution-rules) - [What to Contribute](#what-to-contribute) @@ -45,7 +45,7 @@ While the library should be fully formatted according to the styles, additional ### Pull Request Format -Changes should be submitted as a Pull Request against the master branch of WPILib. For most changes, commits will be squashed upon merge. For particularly large changes, multiple commits are ok, but assume one commit unless asked otherwise. We may ask you to break a PR into multiple standalone PRs or commits for rebase within one PR to separate unrelated changes. No change will be merged unless it is up to date with the current master. We do this to make sure that the git history isn't too cluttered. +Changes should be submitted as a Pull Request against the main branch of WPILib. For most changes, commits will be squashed upon merge. For particularly large changes, multiple commits are ok, but assume one commit unless asked otherwise. We may ask you to break a PR into multiple standalone PRs or commits for rebase within one PR to separate unrelated changes. No change will be merged unless it is up to date with the current main branch. We do this to make sure that the git history isn't too cluttered. ### Merge Process diff --git a/MAINTAINERS.md b/MAINTAINERS.md index de95eec7d9..d4c34909b2 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -11,10 +11,10 @@ For Java dependencies, there is likely a file related to the specific dependency Note, changing artifact locations (This includes changing the artifact year currently, I have an issue open to change this) requires updating the `native-utils` plugin ## Publishing allwpilib -allwpilib publishes to the development repo on every push to master. To publish a release build, upload a new tag, and a release will automatically be built and published. +allwpilib publishes to the development repo on every push to main. To publish a release build, upload a new tag, and a release will automatically be built and published. ## Publishing desktop tools -Desktop tools publish to the development repo on every push to master. To publish a release build, upload a new tag, and a release will automatically be built and published. +Desktop tools publish to the development repo on every push to main. To publish a release build, upload a new tag, and a release will automatically be built and published. ## Publishing VS Code Before publishing, make sure to update the gradlerio version in `vscode-wpilib/resources/gradle/version.txt` Also make sure the gradle wrapper version matches the wrapper required by gradlerio. diff --git a/MavenArtifacts.md b/MavenArtifacts.md index e023abe7f0..be7d1a26f3 100644 --- a/MavenArtifacts.md +++ b/MavenArtifacts.md @@ -9,7 +9,7 @@ We provide two repositories. These repositories are: * (Development) https://frcmaven.wpi.edu/artifactory/development/ The release repository is where official WPILib releases are pushed. -The development repository is where development releases of every commit to [master](https://github.com/wpilibsuite/allwpilib/tree/master) is pushed. +The development repository is where development releases of every commit to [main](https://github.com/wpilibsuite/allwpilib/tree/main) is pushed. ## Artifact classifiers We provide two base types of artifacts. diff --git a/README.md b/README.md index e1b77f1b6d..d6bb31208c 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Using Gradle makes building WPILib very straightforward. It only has a few depen Clone the WPILib repository and follow the instructions above for installing any required tooling. -See the [styleguide README](https://github.com/wpilibsuite/styleguide/blob/master/README.md) for wpiformat setup instructions. +See the [styleguide README](https://github.com/wpilibsuite/styleguide/blob/main/README.md) for wpiformat setup instructions. ## Building