Merge pull request #18 from stuartleeks/sl/main-update

Finish main updates

Author: stuartleeks

README.md

@@ -115,7 +115,7 @@ devcontainer template add-link go
 
 ## Template paths
 
-`devcontainer` can be [configured to scan multiple folders](#working-with-devcontainer-templates) to find templates. It is designed to work with folders structured in the same was as the [containers from in github.com/microsoft/vscode-dev-containers](https://github.com/microsoft/vscode-dev-containers/tree/master/containers).
+`devcontainer` can be [configured to scan multiple folders](#working-with-devcontainer-templates) to find templates. It is designed to work with folders structured in the same was as the [containers from in github.com/microsoft/vscode-dev-containers](https://github.com/microsoft/vscode-dev-containers/tree/main/containers).
 
 Assuming you cloned [github.com/microsoft/vscode-dev-containers/](https://github.com/microsoft/vscode-dev-containers/) into your `~/source/` folder and set up a custom devcontainer folder in `~/source/devcontainers` then you can configure your template paths as shown below. The sub-folder names are used as the template name and when duplicates are found the first matching folder is taken, so in the example below the `~/source/devcontainers` templates take precedence.
 

scripts/ci_release.sh

@@ -10,11 +10,11 @@ fi
 if [ -z ${IS_CI} ]; then
   echo "Not running in CI, skipping CI setup"
 else
-  if [ -z $IS_PR ] && [[ $BRANCH == "refs/heads/master" ]]; then
-    echo "On master setting PUBLISH=true"
+  if [ -z $IS_PR ] && [[ $BRANCH == "refs/heads/main" ]]; then
+    echo "On main setting PUBLISH=true"
     export PUBLISH=true
   else
-    echo "Skipping publish as is from PR: $PR_NUMBER or not 'refs/heads/master' BRANCH: $BRANCH"
+    echo "Skipping publish as is from PR: $PR_NUMBER or not 'refs/heads/main' BRANCH: $BRANCH"
   fi
 fi