Skip to content

Commit

Permalink
chore: replaced references to master branch with main
Browse files Browse the repository at this point in the history
  • Loading branch information
scrthq committed Nov 19, 2024
1 parent 535f973 commit 18faa2e
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 26 deletions.
23 changes: 11 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

<!-- TOC -->

* [Contributing to PSGSuite](#contributing-to-psgsuite)
* [Git and Pull requests](#git-and-pull-requests)
* [Overview](#overview)
* [Step by Step (High-Level)](#step-by-step-high-level)
* [Contributing Guidelines](#contributing-guidelines)
* [Updating the Wiki](#updating-the-wiki)
* [Getting Started](#getting-started)
* [Enabling Debug Mode](#enabling-debug-mode)
* [Google .NET SDK Documentation](#google-net-sdk-documentation)
* [.NET/API Documentation Links](#netapi-documentation-links)
* [Keeping in Touch](#keeping-in-touch)
- [Git and Pull requests](#git-and-pull-requests)
- [Overview](#overview)
- [Step by Step (High-Level)](#step-by-step-high-level)
- [Contributing Guidelines](#contributing-guidelines)
- [Updating the Wiki](#updating-the-wiki)
- [Getting Started](#getting-started)
- [Enabling Debug Mode](#enabling-debug-mode)
- [Google .NET SDK Documentation](#google-net-sdk-documentation)
- [.NET/API Documentation Links](#netapi-documentation-links)
- [Keeping in Touch](#keeping-in-touch)

<!-- /TOC -->

Expand All @@ -35,7 +34,7 @@ Here's the overall flow of making contributions:
3. Push your changes back to your fork on GitHub
4. Submit a pull request
5. Pull request is reviewed. Any necessary edits / suggestions will be made
6. Once changes are approved, the pull request is merged into the origin's master branch and deployed to the PowerShell Gallery once CI tests pass in AppVeyor
6. Once changes are approved, the pull request is merged into the origin's main branch and deployed to the PowerShell Gallery once CI tests pass

### Contributing Guidelines

Expand Down
2 changes: 1 addition & 1 deletion PSGSuite/PSGSuite.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
Tags = 'GSuite', 'Google', 'Apps', 'API', 'Drive', 'Gmail', 'Admin', 'Automation', 'PSEdition_Core', 'Windows', 'Linux', 'Mac'

# A URL to the license for this module.
LicenseUri = 'https://github.com/SCRT-HQ/PSGSuite/blob/master/LICENSE'
LicenseUri = 'https://github.com/SCRT-HQ/PSGSuite/blob/main/LICENSE'

# A URL to the main website for this project.
ProjectUri = 'https://github.com/SCRT-HQ/PSGSuite'
Expand Down
2 changes: 1 addition & 1 deletion Tests/1. Module Tests/PSGSuite.Module.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $projectRoot = Resolve-Path "$PSScriptRoot\..\.."
$ModulePath = Resolve-Path "$projectRoot\BuildOutput\$($env:BHProjectName)"
$decompiledModulePath = Resolve-Path "$projectRoot\$($env:BHProjectName)"

# Verbose output for non-master builds on appveyor
# Verbose output for non-main builds on appveyor
# Handy for troubleshooting.
# Splat @Verbose against commands as needed (here or in pester tests)
$Verbose = @{}
Expand Down
6 changes: 3 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ else {
$ENV:BUILD_BUILDURI -notlike 'vstfs:*' -or
$env:BUILD_SOURCEBRANCH -like '*pull*' -or
$env:BUILD_SOURCEVERSIONMESSAGE -notmatch '!deploy' -or
$env:BUILD_SOURCEBRANCHNAME -ne 'master' -or
$env:BUILD_SOURCEBRANCHNAME -ne 'main' -or
$PSVersionTable.PSVersion.Major -ne 5 -or
$null -eq $env:NugetApiKey
)
) {
"Task is 'Deploy', but conditions are not correct for deployment:`n" +
" + Current build system is VSTS : $($env:BUILD_BUILDURI -like 'vstfs:*') [$env:BUILD_BUILDURI]`n" +
" + Current branch is master : $($env:BUILD_SOURCEBRANCHNAME -eq 'master') [$env:BUILD_SOURCEBRANCHNAME]`n" +
" + Current branch is main : $($env:BUILD_SOURCEBRANCHNAME -eq 'main') [$env:BUILD_SOURCEBRANCHNAME]`n" +
" + Source is not a pull request : $($env:BUILD_SOURCEBRANCH -notlike '*pull*') [$env:BUILD_SOURCEBRANCH]`n" +
" + Current PS major version is 5 : $($PSVersionTable.PSVersion.Major -eq 5) [$($PSVersionTable.PSVersion.ToString())]`n" +
" + NuGet API key is not null : $($null -ne $env:NugetApiKey)`n" +
Expand All @@ -131,7 +131,7 @@ else {
"Task is 'Deploy' and conditions are correct for deployment:`n" +
" + Build script is Force ran : $($Force)`n" +
" + Current build system is VSTS : $($env:BUILD_BUILDURI -like 'vstfs:*') [$env:BUILD_BUILDURI]`n" +
" + Current branch is master : $($env:BUILD_SOURCEBRANCHNAME -eq 'master') [$env:BUILD_SOURCEBRANCHNAME]`n" +
" + Current branch is main : $($env:BUILD_SOURCEBRANCHNAME -eq 'main') [$env:BUILD_SOURCEBRANCHNAME]`n" +
" + Source is not a pull request : $($env:BUILD_SOURCEBRANCH -notlike '*pull*') [$env:BUILD_SOURCEBRANCH]`n" +
" + Current PS major version is 5 : $($PSVersionTable.PSVersion.Major -eq 5) [$($PSVersionTable.PSVersion.ToString())]`n" +
" + NuGet API key is not null : $($null -ne $env:NugetApiKey)`n" +
Expand Down
11 changes: 5 additions & 6 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PSGSuite
<div align="center">
<img src="https://github.com/scrthq/PSGSuite/raw/master/bin/img/psgsuite2.0.0.png" alt="PSGSuite 2.0.0 released!" />
<img src="https://github.com/scrthq/PSGSuite/raw/main/bin/img/psgsuite2.0.0.png" alt="PSGSuite 2.0.0 released!" />
<br />
<br />
<!-- Azure Pipelines -->
Expand Down Expand Up @@ -56,7 +56,7 @@ Check out [PSGSuite.io](https://psgsuite.io/) for PSGSuite documentation, includ

## Contributing

Interested in helping out with PSGSuite development? Please check out our [Contribution Guidelines](https://github.com/scrthq/PSGSuite/blob/master/CONTRIBUTING.md)!
Interested in helping out with PSGSuite development? Please check out our [Contribution Guidelines](https://github.com/scrthq/PSGSuite/blob/main/CONTRIBUTING.md)!

Building the module locally to test changes is as easy as running the `build.ps1` file in the root of the repo. This will compile the module with your changes and import the newly compiled module at the end by default.

Expand All @@ -68,15 +68,15 @@ Want to run the Pester tests locally? Pass `Test` as the value to the `Task` scr

## Code of Conduct

Please adhere to our [Code of Conduct](https://github.com/scrthq/PSGSuite/blob/master/CODE_OF_CONDUCT.md) when interacting with this repo.
Please adhere to our [Code of Conduct](https://github.com/scrthq/PSGSuite/blob/main/CODE_OF_CONDUCT.md) when interacting with this repo.

## License

[Apache 2.0](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))

## Changelog

[Full CHANGELOG here](https://github.com/scrthq/PSGSuite/blob/master/CHANGELOG.md)
[Full CHANGELOG here](https://github.com/scrthq/PSGSuite/blob/main/CHANGELOG.md)

***

Expand Down Expand Up @@ -156,7 +156,7 @@ All other functions are either intact or have an alias included to support backw

### Most recent changes

[Full CHANGELOG here](https://github.com/scrthq/PSGSuite/blob/master/CHANGELOG.md)
[Full CHANGELOG here](https://github.com/scrthq/PSGSuite/blob/main/CHANGELOG.md)

#### 2.33.1 - 2019-10-06

Expand All @@ -177,4 +177,3 @@ All other functions are either intact or have an alias included to support backw

* [Issue #236](https://github.com/scrthq/PSGSuite/issues/236)
* Fixed: Custom converter for Configuration metadata defaults to `ConvertTo-SecureString` as the preferred function instead of the custom `Secure`. `Secure` is still supported for backwards compatibility.

6 changes: 3 additions & 3 deletions psake.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ $deployScriptBlock = {
$VersionNumber,
[parameter(Mandatory = $false)]
[String]
$CommitId = 'master',
$CommitId = 'main',
[parameter(Mandatory = $true)]
[String]
$ReleaseNotes,
Expand Down Expand Up @@ -482,7 +482,7 @@ $deployScriptBlock = {
}
$result = Invoke-RestMethod @uploadParams
}
if (($ENV:BHBuildSystem -eq 'VSTS' -and $env:BHCommitMessage -match '!deploy' -and $env:BHBranchName -eq "master") -or $global:ForceDeploy -eq $true) {
if (($ENV:BHBuildSystem -eq 'VSTS' -and $env:BHCommitMessage -match '!deploy' -and $env:BHBranchName -eq "main") -or $global:ForceDeploy -eq $true) {
if ($null -eq (Get-Module PoshTwit -ListAvailable)) {
" Installing PoshTwit module..."
Install-Module PoshTwit -Scope CurrentUser
Expand Down Expand Up @@ -618,7 +618,7 @@ $deployScriptBlock = {

}
else {
Write-Host -ForegroundColor Magenta "Build system is not VSTS, commit message does not contain '!deploy' and/or branch is not 'master' -- skipping module update!"
Write-Host -ForegroundColor Magenta "Build system is not VSTS, commit message does not contain '!deploy' and/or branch is not 'main' -- skipping module update!"
}
}

Expand Down

0 comments on commit 18faa2e

Please sign in to comment.