From e2c2671c7f66deb64e736c91fa51d0884f57384b Mon Sep 17 00:00:00 2001 From: David Swan Date: Tue, 10 Nov 2020 10:05:14 +0000 Subject: [PATCH] (IAC1001) - Removal of inappropriate terminology Removal of any inappropriate or offensive terminology from the codebase. --- .github/pull_request_template.md | 4 ++-- .github/workflows/release.yml | 4 ++-- CHANGELOG.md | 2 +- CONTRIBUTING.md | 2 +- HISTORY.md | 2 +- metadata.json | 4 ++-- spec/fixtures/scripts/install_pwsh/windows.ps1 | 1 + 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 49554d91..100430f7 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,13 +3,13 @@ BEFORE YOU CREATE A PULL REQUEST: Ensure you have read over -CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-powershell/blob/master/CONTRIBUTING.md +CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-powershell/blob/main/CONTRIBUTING.md We provide defined guidance (as such, we strongly adhere to it). A summary of our expectations: - A ticket was created at https://tickets.puppetlabs.com/secure/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&components=12015&summary=%5BPOWERSHELL%5D%20, or you have an existing ticket # - - You are not submitting a pull request from your MASTER branch. + - You are not submitting a pull request from your MAIN branch. - The first line of your git commit message has the ticket # and a short summary of the fix, followed by a detailed explanation of the fix in the git commit body. - Your git commit message format is important. We have a very defined expectation for this format and are keep to it. Really, READ the entire Contributing document. It will save you and us time. - Do not reformat code, it makes it hard to see what has changed. Leave the formatting to us. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dacc2ff7..43f4754e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Litmus Parallel - uses: puppetlabs/action-litmus_parallel@master + uses: puppetlabs/action-litmus_parallel@main with: platform: ${{ matrix.platform }} agent_family: ${{ matrix.agent_family }} @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Spec Tests - uses: puppetlabs/action-litmus_spec@master + uses: puppetlabs/action-litmus_spec@main with: puppet_gem_version: ${{ matrix.puppet_gem_version }} check: ${{ matrix.check }} diff --git a/CHANGELOG.md b/CHANGELOG.md index e2a48ba5..5398545f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -218,7 +218,7 @@ All notable changes to this project will be documented in this file. The format - Fixed issue with metadata and PE version requirement -[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...master +[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...main [2.3.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.2.0...2.3.0 [2.2.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.5...2.2.0 [2.1.5]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.4...2.1.5 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a9fb3a5..9c171f99 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,7 +108,7 @@ process as easy as possible. To submit your changes via a GitHub pull request, we _highly_ recommend that you have them on a topic branch, instead of - directly on "master". + directly on "main". It makes things much easier to keep track of, especially if you decide to work on another thing before your first change is merged in. diff --git a/HISTORY.md b/HISTORY.md index f1b53983..2c4bdfc1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -177,7 +177,7 @@ - Fixed issue with metadata and PE version requirement -[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...master +[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...main [2.3.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.2.0...2.3.0 [2.2.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.5...2.2.0 [2.1.5]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.4...2.1.5 diff --git a/metadata.json b/metadata.json index 403c0c05..50d74ed0 100644 --- a/metadata.json +++ b/metadata.json @@ -81,6 +81,6 @@ } ], "pdk-version": "1.18.1", - "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-gd610ead" + "template-url": "https://github.com/puppetlabs/pdk-templates#main", + "template-ref": "heads/main-0-gd610ead" } diff --git a/spec/fixtures/scripts/install_pwsh/windows.ps1 b/spec/fixtures/scripts/install_pwsh/windows.ps1 index 19ce5caf..213cbd02 100644 --- a/spec/fixtures/scripts/install_pwsh/windows.ps1 +++ b/spec/fixtures/scripts/install_pwsh/windows.ps1 @@ -1,4 +1,5 @@ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +# Replace the below `master` reference when possible Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/raw/master/tools/install-powershell.ps1 -UseBasicParsing -OutFile install-pwsh.ps1 & ./install-pwsh.ps1 -AddToPath