skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: clean up references to old master branch (#45856)

Browse Source 
Cleans up all references to the `master` branch we renamed to
`main` across Angular.

PR Close #45856
This commit is contained in:
Paul Gschwendtner
2022-05-03 18:34:54 +00:00
committed by Andrew Kushnir
parent aef5c92b0b
commit 68a6a075f4
70 changed files with 200 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aio/aio-builds-setup/docs/vm-setup--update-docker-container.md
+1 -1
View File
@@ -6,7 +6,7 @@ Assuming you have cloned the repository containing the preview server code (as d
[here](vm-setup--create-docker-image.md)), you can use the `update-preview-server.sh` script on the
VM host to update the preview server based on changes in the source code.
The script will pull the latest changes from the origin's master branch and examine if there have
The script will pull the latest changes from the origin's main branch and examine if there have
been any changes in files inside the preview server source code directory (see below). If there are,
it will create a new image and verify that it works as expected. Finally, it will stop and remove
the old docker container and image, create a new container based on the new image and start it.
aio/aio-builds-setup/scripts/update-preview-server.sh
+2 -2
View File
@@ -25,8 +25,8 @@ readonly CONTAINER_NAME=aio
readonly lastDeployedCommit=$(git rev-parse HEAD)
echo "Currently at commit $lastDeployedCommit."
# Pull latest master from origin.
git pull origin master
# Pull latest main from origin.
git pull origin main
# Do not update the server unless files inside `aio-builds-setup/` have changed
# or the last attempt failed (identified by the provisional image still being around).