diff options
author | Tim Smith <tsmith@chef.io> | 2021-08-25 15:13:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-25 15:13:49 -0700 |
commit | 03274dd25908f50e242c3b6647ed90c8d33be43f (patch) | |
tree | f8174aa390a40b686c129c195129285e2ab3dd24 | |
parent | 70ac07e812f5fecb2537d5811023b19f7dfd2074 (diff) | |
parent | 0c1c8e38fdd04b3f868b2fe6830e410faa8e6ca2 (diff) | |
download | ohai-03274dd25908f50e242c3b6647ed90c8d33be43f.tar.gz |
Merge pull request #1691 from chef/branch_rename
Update tests and links for the branch rename
-rw-r--r-- | .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 2 | ||||
-rw-r--r-- | .github/workflows/exec.yml | 4 | ||||
-rw-r--r-- | .github/workflows/lint.yml | 2 | ||||
-rw-r--r-- | .github/workflows/unit.yml | 4 | ||||
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | Gemfile | 6 | ||||
-rw-r--r-- | OHAI_MVPS.md | 2 | ||||
-rw-r--r-- | README.md | 10 | ||||
-rw-r--r-- | lib/ohai/config.rb | 2 | ||||
-rw-r--r-- | spec/functional/application_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/plugins/linux/platform_spec.rb | 20 | ||||
-rw-r--r-- | tasks/spellcheck.rb | 2 |
12 files changed, 29 insertions, 29 deletions
diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md index 80435f82..399de366 100644 --- a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -5,7 +5,7 @@ about: If you have a question 💬, please check out our Slack! We use GitHub issues to track bugs and feature requests. If you need help please post to our Mailing List or join the Chef Community Slack. -* Chef Community Slack at <http://community-slack.chef.io/.> +* Chef Community Slack at <https://community-slack.chef.io/.> * Chef Mailing List <https://discourse.chef.io/> Support issues opened here will be closed and redirected to Slack or Discourse. diff --git a/.github/workflows/exec.yml b/.github/workflows/exec.yml index dc64b76e..fa43ed70 100644 --- a/.github/workflows/exec.yml +++ b/.github/workflows/exec.yml @@ -5,7 +5,7 @@ name: exec pull_request: push: branches: - - master + - main jobs: test: @@ -13,7 +13,7 @@ jobs: strategy: matrix: ruby: ['2.7', '3.0'] - name: Unit test on Ruby ${{ matrix.ruby }} + name: Exec Ohai on ${{ matrix.os }} with Ruby ${{ matrix.ruby }} steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 797e202c..0ff1c387 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,7 +5,7 @@ name: lint pull_request: push: branches: - - master + - main jobs: chefstyle: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 82b5e7b7..ddf9b1f1 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -5,7 +5,7 @@ name: unit pull_request: push: branches: - - master + - main jobs: test: @@ -13,7 +13,7 @@ jobs: strategy: matrix: ruby: ['2.7', '3.0'] - name: Unit test on Ruby ${{ matrix.ruby }} + name: Unit test on ${{ matrix.os }} with Ruby ${{ matrix.ruby }} steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 03fdbfa7..a0bbb962 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -Please refer to https://github.com/chef/chef/blob/master/CONTRIBUTING.md +Please refer to https://github.com/chef/chef/blob/main/CONTRIBUTING.md @@ -3,9 +3,9 @@ source "https://rubygems.org" gemspec -# pull these gems from master of chef/chef so that we're testing against what we will release -gem "chef-config", git: "https://github.com/chef/chef", branch: "master", glob: "chef-config/chef-config.gemspec" -gem "chef-utils", git: "https://github.com/chef/chef", branch: "master", glob: "chef-utils/chef-utils.gemspec" +# pull these gems from main of chef/chef so that we're testing against what we will release +gem "chef-config", git: "https://github.com/chef/chef", branch: "main", glob: "chef-config/chef-config.gemspec" +gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "chef-utils/chef-utils.gemspec" # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local group :development do diff --git a/OHAI_MVPS.md b/OHAI_MVPS.md index 7ba34f93..9d40f57a 100644 --- a/OHAI_MVPS.md +++ b/OHAI_MVPS.md @@ -6,7 +6,7 @@ Every release of Ohai we pick someone from the community to name as the Most Val After receiving three MVP awards, we add someone to the hall of fame. We want to express our gratitude to their continuing participation and give newer community members the opportunity to be recognized. -The [MVP list](https://github.com/chef/chef/blob/master/CHEF_MVPS.md) is kept in the Chef project. +The [MVP list](https://github.com/chef/chef/blob/main/CHEF_MVPS.md) is kept in the Chef project. #### Ohai Release MVP Recipients @@ -1,10 +1,10 @@ # ohai -[![Build status](https://badge.buildkite.com/aa0b961fc3e5bed315c7035c6d60a4aaee57af9610cbde9a15.svg?branch=master)](https://buildkite.com/chef-oss/chef-ohai-master-verify) [![Gem Version](https://badge.fury.io/rb/ohai.svg)](https://badge.fury.io/rb/ohai) +[![Build status](https://badge.buildkite.com/aa0b961fc3e5bed315c7035c6d60a4aaee57af9610cbde9a15.svg?branch=main)](https://buildkite.com/chef-oss/chef-ohai-main-verify) [![Gem Version](https://badge.fury.io/rb/ohai.svg)](https://badge.fury.io/rb/ohai) -**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-infra.md) +**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/main/projects/chef-infra.md) -**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active) +**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/main/repo-management/repo-states.md#active) **Issues Response SLA**: 10 business days @@ -76,7 +76,7 @@ rake style:auto_correct # Auto-correct RuboCop offenses Source: -- <https://github.com/chef/ohai/tree/master> +- <https://github.com/chef/ohai/tree/main> Issues: @@ -84,7 +84,7 @@ Issues: ## Contributing -For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md> +For information on contributing to this project see <https://github.com/chef/chef/blob/main/CONTRIBUTING.md> 1. Fork it 1. Create your feature branch (git checkout -b my-new-feature) diff --git a/lib/ohai/config.rb b/lib/ohai/config.rb index 88200cf6..76930038 100644 --- a/lib/ohai/config.rb +++ b/lib/ohai/config.rb @@ -26,7 +26,7 @@ module Ohai Config = ChefConfig::Config # Reopens ChefConfig::Config to add Ohai configuration settings. - # see: https://github.com/chef/chef/blob/master/lib/chef/config.rb + # see: https://github.com/chef/chef/blob/main/lib/chef/config.rb class Config config_context :ohai do default :disabled_plugins, [] diff --git a/spec/functional/application_spec.rb b/spec/functional/application_spec.rb index 26199a05..aec4b89c 100644 --- a/spec/functional/application_spec.rb +++ b/spec/functional/application_spec.rb @@ -71,7 +71,7 @@ RSpec.describe "Ohai::Application" do # env['KNIFE_HOME']/config.rb is the first config file the workstation # config loader looks for: - # https://github.com/chef/chef/blob/master/chef-config/lib/chef-config/workstation_config_loader.rb#L102 + # https://github.com/chef/chef/blob/main/chef-config/lib/chef-config/workstation_config_loader.rb#L102 let(:env) { { "KNIFE_HOME" => config_dir } } before do diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb index 33d3bb90..8d27e211 100644 --- a/spec/unit/plugins/linux/platform_spec.rb +++ b/spec/unit/plugins/linux/platform_spec.rb @@ -82,52 +82,52 @@ describe Ohai::System, "Linux plugin platform" do end describe "#platform_id_remap" do - # https://github.com/chef/os_release/blob/master/redhat_7 + # https://github.com/chef/os_release/blob/main/redhat_7 it "returns redhat for rhel os-release id" do expect(plugin.platform_id_remap("rhel")).to eq("redhat") end - # https://github.com/chef/os_release/blob/master/amazon_2018 + # https://github.com/chef/os_release/blob/main/amazon_2018 it "returns amazon for amzn os-release id" do expect(plugin.platform_id_remap("amzn")).to eq("amazon") end - # https://github.com/chef/os_release/blob/master/oracle_7 + # https://github.com/chef/os_release/blob/main/oracle_7 it "returns oracle for ol os-release id" do expect(plugin.platform_id_remap("ol")).to eq("oracle") end - # https://github.com/chef/os_release/blob/master/sles_sap_12_3 + # https://github.com/chef/os_release/blob/main/sles_sap_12_3 it "returns suse for sles_sap os-release id" do expect(plugin.platform_id_remap("sles_sap")).to eq("suse") end - # https://github.com/chef/os_release/blob/master/archarm + # https://github.com/chef/os_release/blob/main/archarm it "returns arch for archarm" do expect(plugin.platform_id_remap("archarm")).to eq("arch") end - # https://github.com/chef/os_release/blob/master/sles_15_0 + # https://github.com/chef/os_release/blob/main/sles_15_0 it "returns suse for sles os-release id" do expect(plugin.platform_id_remap("sles")).to eq("suse") end - # https://github.com/chef/os_release/blob/master/opensuseleap_15_0 + # https://github.com/chef/os_release/blob/main/opensuseleap_15_0 it "returns opensuseleap for opensuse-leap os-release id" do expect(plugin.platform_id_remap("opensuse-leap")).to eq("opensuseleap") end - # https://github.com/chef/os_release/blob/master/xenserver_7_6 + # https://github.com/chef/os_release/blob/main/xenserver_7_6 it "returns xenserver for xenenterprise os-release id" do expect(plugin.platform_id_remap("xenenterprise")).to eq("xenserver") end - # https://github.com/chef/os_release/blob/master/cumulus_3_7 + # https://github.com/chef/os_release/blob/main/cumulus_3_7 it "returns cumulus for cumulus-linux os-release id" do expect(plugin.platform_id_remap("cumulus-linux")).to eq("cumulus") end - # See https://github.com/chef/os_release/blob/master/xcp-ng_7_4#L3 for an example of why we do this + # See https://github.com/chef/os_release/blob/main/xcp-ng_7_4#L3 for an example of why we do this it "returns a downcased ID value" do expect(plugin.platform_id_remap("XCP-ng")).to eq("xcp-ng") end diff --git a/tasks/spellcheck.rb b/tasks/spellcheck.rb index ee994283..15345b45 100644 --- a/tasks/spellcheck.rb +++ b/tasks/spellcheck.rb @@ -18,7 +18,7 @@ namespace :spellcheck do task :fetch_common do - sh "wget -q https://raw.githubusercontent.com/chef/chef_dictionary/master/chef.txt -O chef_dictionary.txt" + sh "wget -q https://raw.githubusercontent.com/chef/chef_dictionary/main/chef.txt -O chef_dictionary.txt" end task run: %i{config_check fetch_common} do |