From de426b47f1bb8e8f03b9156e04f6d0487f52c53e Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 17 Jan 2021 16:53:23 -0500 Subject: [PATCH] dev: rename default git branch to `main` Closes #2094 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/macos.yml | 6 +++--- CHANGELOG.md | 2 +- README.md | 2 +- appveyor.yml | 2 +- concourse/nokogiri-pr.yml | 2 +- concourse/nokogiri-pr.yml.generated | 2 +- concourse/nokogiri-truffleruby.yml | 6 +++--- concourse/nokogiri-truffleruby.yml.generated | 6 +++--- concourse/nokogiri.yml | 8 ++++---- concourse/nokogiri.yml.generated | 8 ++++---- rakelib/cross-ruby.rake | 1 - 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cd515cb28b..d17a637918 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ -- Thank you for contributing to Nokogiri! To help us prioritize, please take care to answer the -- questions below when you submit this pull request. -- --- The Nokogiri core team work off of `master`, so please submit all PRs based on the `master` +-- The Nokogiri core team work off of `main`, so please submit all PRs based on the `main` -- branch. We generally will cherry-pick relevant bug fixes onto the current release branch. --> diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f59c8b7e82..db688dcb48 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,7 +2,7 @@ name: macos on: push: branches: - - master + - main pull_request: branches: - '*' @@ -11,7 +11,7 @@ jobs: cruby-test-system-libraries: runs-on: macos-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Set ENV run: | @@ -27,7 +27,7 @@ jobs: cruby-test-vendored-libraries: runs-on: macos-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - uses: actions/cache@v2 with: path: ports/archives diff --git a/CHANGELOG.md b/CHANGELOG.md index 215e05ae44..4ce5c5422a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,7 +57,7 @@ See note below about CVE-2020-26247 in the "Changed" subsection entitled "XML::S * Add support for CSS queries `a:has(> b)`, `a:has(~ b)`, and `a:has(+ b)`. [[#688](https://github.com/sparklemotion/nokogiri/issues/688)] (Thanks, [@jonathanhefner](https://github.com/jonathanhefner)!) * Add `Node#value?` to better match expected semantics of a Hash-like object. [[#1838](https://github.com/sparklemotion/nokogiri/issues/1838), [#1840](https://github.com/sparklemotion/nokogiri/issues/1840)] (Thanks, [@MatzFan](https://github.com/MatzFan)!) * [CRuby] Add `Nokogiri::XML::Node#line=` for use by downstream libs like nokogumbo. [[#1918](https://github.com/sparklemotion/nokogiri/issues/1918)] (Thanks, [@stevecheckoway](https://github.com/stevecheckoway)!) -* `nokogiri.gemspec` is back after a 10-year hiatus. We still prefer you use the official releases, but master is pretty stable these days, and YOLO. +* `nokogiri.gemspec` is back after a 10-year hiatus. We still prefer you use the official releases, but `main` is pretty stable these days, and YOLO. ### Performance diff --git a/README.md b/README.md index 4407cf8c26..0c0308a4e4 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Some guiding principles Nokogiri tries to follow: ## Status [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/cruby-2.7/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri) -[![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/branch/master?svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri/branch/master) +[![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/branch/main?svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri/branch/main) [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri) [![Test Coverage](https://api.codeclimate.com/v1/badges/59c67b0e8976027a45ad/test_coverage)](https://codeclimate.com/github/sparklemotion/nokogiri/test_coverage) diff --git a/appveyor.yml b/appveyor.yml index 2090bfbf50..6533b8a564 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2019 branches: only: - - master + - main skip_branch_with_pr: true diff --git a/concourse/nokogiri-pr.yml b/concourse/nokogiri-pr.yml index 3ef544f197..09914b5d63 100644 --- a/concourse/nokogiri-pr.yml +++ b/concourse/nokogiri-pr.yml @@ -95,7 +95,7 @@ resources: icon: cog source: uri: https://github.com/sparklemotion/nokogiri/ - branch: master + branch: main disable_ci_skip: true #! always get the latest pipeline configuration - name: nokogiri-pr type: pull-request diff --git a/concourse/nokogiri-pr.yml.generated b/concourse/nokogiri-pr.yml.generated index ccf8750817..496e933b96 100644 --- a/concourse/nokogiri-pr.yml.generated +++ b/concourse/nokogiri-pr.yml.generated @@ -1179,7 +1179,7 @@ resources: - icon: cog name: ci source: - branch: master + branch: main disable_ci_skip: true uri: https://github.com/sparklemotion/nokogiri/ type: git diff --git a/concourse/nokogiri-truffleruby.yml b/concourse/nokogiri-truffleruby.yml index 1862275052..6e9140c823 100644 --- a/concourse/nokogiri-truffleruby.yml +++ b/concourse/nokogiri-truffleruby.yml @@ -29,16 +29,16 @@ resources: icon: cog source: uri: https://github.com/sparklemotion/nokogiri/ - branch: master + branch: main disable_ci_skip: true #! always get the latest pipeline configuration - name: nokogiri type: git icon: "github" check_every: 5m - webhook_token: ((nokogiri-master-webhook-token)) + webhook_token: ((nokogiri-main-webhook-token)) source: uri: https://github.com/sparklemotion/nokogiri/ - branch: master + branch: main ignore_paths: - "*.md" - "concourse/**" diff --git a/concourse/nokogiri-truffleruby.yml.generated b/concourse/nokogiri-truffleruby.yml.generated index d00a4c7f75..9f90ee9483 100644 --- a/concourse/nokogiri-truffleruby.yml.generated +++ b/concourse/nokogiri-truffleruby.yml.generated @@ -88,7 +88,7 @@ resources: - icon: cog name: ci source: - branch: master + branch: main disable_ci_skip: true uri: https://github.com/sparklemotion/nokogiri/ type: git @@ -96,7 +96,7 @@ resources: icon: github name: nokogiri source: - branch: master + branch: main ignore_paths: - '*.md' - concourse/** @@ -105,7 +105,7 @@ resources: - Vagrantfile uri: https://github.com/sparklemotion/nokogiri/ type: git - webhook_token: ((nokogiri-master-webhook-token)) + webhook_token: ((nokogiri-main-webhook-token)) - check_every: 15m icon: github name: nokogiri-pr diff --git a/concourse/nokogiri.yml b/concourse/nokogiri.yml index 3abcb78e21..1e417f283e 100644 --- a/concourse/nokogiri.yml +++ b/concourse/nokogiri.yml @@ -61,7 +61,7 @@ resources: icon: cog source: uri: https://github.com/sparklemotion/nokogiri/ - branch: master + branch: main disable_ci_skip: true #! always get the latest pipeline configuration - name: irc type: irc-notification @@ -82,10 +82,10 @@ resources: type: git icon: "github" check_every: 5m - webhook_token: ((nokogiri-master-webhook-token)) + webhook_token: ((nokogiri-main-webhook-token)) source: uri: https://github.com/sparklemotion/nokogiri/ - branch: master + branch: main ignore_paths: - "*.md" - "concourse/**" @@ -151,7 +151,7 @@ jobs: TEST_WITH_SYSTEM_LIBRARIES: t #@ if ruby_version == cruby_versions["supported"][-1]: CC_TEST_REPORTER_ID: ((code_climate_reporter_id_nokogiri)) - GIT_BRANCH: master + GIT_BRANCH: main #@ end run: {path: ci/concourse/tasks/rake-test/run.sh} - task: rake-test-vendored-libraries diff --git a/concourse/nokogiri.yml.generated b/concourse/nokogiri.yml.generated index a373b1a21f..478123d96a 100644 --- a/concourse/nokogiri.yml.generated +++ b/concourse/nokogiri.yml.generated @@ -281,7 +281,7 @@ jobs: - name: nokogiri params: CC_TEST_REPORTER_ID: ((code_climate_reporter_id_nokogiri)) - GIT_BRANCH: master + GIT_BRANCH: main TEST_WITH_SYSTEM_LIBRARIES: t platform: linux run: @@ -770,7 +770,7 @@ resources: - icon: cog name: ci source: - branch: master + branch: main disable_ci_skip: true uri: https://github.com/sparklemotion/nokogiri/ type: git @@ -793,7 +793,7 @@ resources: icon: github name: nokogiri source: - branch: master + branch: main ignore_paths: - '*.md' - concourse/** @@ -802,4 +802,4 @@ resources: - Vagrantfile uri: https://github.com/sparklemotion/nokogiri/ type: git - webhook_token: ((nokogiri-master-webhook-token)) + webhook_token: ((nokogiri-main-webhook-token)) diff --git a/rakelib/cross-ruby.rake b/rakelib/cross-ruby.rake index 89d64cf4aa..bc5067e3f6 100644 --- a/rakelib/cross-ruby.rake +++ b/rakelib/cross-ruby.rake @@ -282,7 +282,6 @@ namespace "gem" do task "builder" do gem_builder(plat) end - task "guest" => "builder" # TODO: remove me after this code is on master, temporary backwards compat for CI end end