dev: rename default git branch to main

Closes #2094

.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.
 -->
 

.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

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

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)
 

appveyor.yml

@@ -2,7 +2,7 @@ image: Visual Studio 2019
 
 branches:
   only:
-  - master
+  - main
 
 skip_branch_with_pr: true
 

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

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

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/**"

concourse/nokogiri-truffleruby.yml.generated

@@ -88,15 +88,15 @@ resources:
 - icon: cog
   name: ci
   source:
-    branch: master
+    branch: main
     disable_ci_skip: true
     uri: https://github.com/sparklemotion/nokogiri/
   type: git
 - check_every: 5m
   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

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

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))

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