Skip to content

Commit

Permalink
Rename master to main (#171)
Browse files Browse the repository at this point in the history
  • Loading branch information
luiscantero authored Aug 16, 2022
1 parent 9110605 commit 0100f74
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ urlFragment: azure-iot-sample-opc-ua-server
# OPC PLC server
Implements an OPC-UA server with different nodes generating random data, anomalies and configuration of user defined nodes.

[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fiot-edge-opc-plc%2Fmaster%2Ftools%2Ftemplates%2Fazuredeploy.opcplc.aci.json)
[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fiot-edge-opc-plc%2Fmain%2Ftools%2Ftemplates%2Fazuredeploy.opcplc.aci.json)

* After deployment, the OPC PLC server will be available at `opc.tcp://<NAME>.<REGION>.azurecontainer.io:50000`
* See [region limits](https://docs.microsoft.com/en-us/azure/container-instances/container-instances-region-availability#availability---general)
Expand Down
4 changes: 2 additions & 2 deletions tools/scripts/acr-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ $namespace = $branchName
if ($namespace.StartsWith("feature/")) {
$namespace = $namespace.Replace("feature/", "")
}
elseif ($namespace.StartsWith("release/") -or ($namespace -eq "master")) {
elseif ($namespace.StartsWith("release/") -or ($namespace -eq "main")) {
$namespace = "public"
$releaseBuild = $true
}
$namespace = $namespace.Replace("_", "/").Substring(0, [Math]::Min($namespace.Length, 24))
$namespace = "$($namespace)/"

if (![string]::IsNullOrEmpty($Registry) -and ($Registry -ne "industrialiot")) {
# if we build from release or from master and registry is provided we leave namespace empty
# if we build from release or from main and registry is provided we leave namespace empty
if ($releaseBuild) {
$namespace = ""
}
Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.4.2",
"version": "2.5.0",
"versionHeightOffset": -1,
"publicReleaseRefSpec": [
"^refs/heads/master$",
"^refs/heads/main$",
"^refs/heads/release/\\d+\\.\\d+"
],
"cloudBuild": {
Expand Down

0 comments on commit 0100f74

Please sign in to comment.