Update Repo for `main` branch (#2608)

Switch from `master` to `main` for the default branch
* Update CircleCI configuration
* Update Gradle snapshot detection
* Update issue templates

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
pull/2615/head
Danno Ferrin 3 years ago committed by GitHub
parent 3eccc26742
commit 5e0301a749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .circleci/config.yml
  2. 2
      .github/issue_template.md
  3. 2
      .github/pull_request_template.md
  4. 2
      .github/workflows/repolinter.yml
  5. 2
      build.gradle
  6. 2
      ethereum/evmtool/build.gradle

@ -294,7 +294,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- /^release-.*/ - /^release-.*/
requires: requires:
- integrationTests - integrationTests
@ -307,7 +307,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- /^release-.*/ - /^release-.*/
requires: requires:
- integrationTests - integrationTests

@ -1,7 +1,7 @@
<!-- Have you done the following? --> <!-- Have you done the following? -->
<!-- * read the Code of Conduct? By filing an Issue, you are expected to --> <!-- * read the Code of Conduct? By filing an Issue, you are expected to -->
<!-- comply with it, including treating everyone with respect: --> <!-- comply with it, including treating everyone with respect: -->
<!-- https://github.com/hyperledger/besu/blob/master/CODE_OF_CONDUCT.md --> <!-- https://github.com/hyperledger/besu/blob/main/CODE_OF_CONDUCT.md -->
<!-- * Reproduced the issue in the latest version of the software --> <!-- * Reproduced the issue in the latest version of the software -->
<!-- * Read the debugging docs: https://besu.hyperledger.org/en/stable/HowTo/Monitor/Logging/ --> <!-- * Read the debugging docs: https://besu.hyperledger.org/en/stable/HowTo/Monitor/Logging/ -->
<!-- * Duplicate Issue check: https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu --> <!-- * Duplicate Issue check: https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu -->

@ -1,5 +1,5 @@
<!-- Thanks for sending a pull request! Please check out our contribution guidelines: --> <!-- Thanks for sending a pull request! Please check out our contribution guidelines: -->
<!-- https://github.com/hyperledger/besu/blob/master/CONTRIBUTING.md --> <!-- https://github.com/hyperledger/besu/blob/main/CONTRIBUTING.md -->
## PR description ## PR description

@ -21,4 +21,4 @@ jobs:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Lint Repo - name: Lint Repo
run: bundle exec /app/bin/repolinter.js --rulesetUrl https://raw.githubusercontent.com/hyperledger-labs/hyperledger-community-management-tools/master/repo_structure/repolint.json --format markdown run: bundle exec /app/bin/repolinter.js --rulesetUrl https://raw.githubusercontent.com/hyperledger-labs/hyperledger-community-management-tools/main/repo_structure/repolint.json --format markdown

@ -713,7 +713,7 @@ task dockerUpload {
def image = "${imageName}:${dockerBuildVersion}" def image = "${imageName}:${dockerBuildVersion}"
def additionalTags = [] def additionalTags = []
if (project.hasProperty('branch') && project.property('branch') == 'master') { if (project.hasProperty('branch') && project.property('branch') == 'main') {
additionalTags.add('develop') additionalTags.add('develop')
} }

@ -120,7 +120,7 @@ task dockerUpload(type: Exec) {
def cmd = "docker push '${image}'" def cmd = "docker push '${image}'"
def additionalTags = [] def additionalTags = []
if (project.hasProperty('branch') && project.property('branch') == 'master') { if (project.hasProperty('branch') && project.property('branch') == 'main') {
additionalTags.add('develop') additionalTags.add('develop')
} }

Loading…
Cancel
Save