Merge pull request #6 from PaulHigin/ci-mirror-f2

PaulHigin · web-flow · commit 5c2b72005bd8 · 2021-06-08T14:14:42.000-07:00
Update mirror yml
diff --git a/.ci/mirrorTemplates/githubMirror.yml b/.ci/mirrorTemplates/githubMirror.yml
@@ -72,30 +72,30 @@ stages:
         workingDirectory: '$(ghRepoPath)'
 
       - pwsh: |
-            Write-verbose -message 'adding remote' -verbose
+            Write-verbose -message 'adding github remote' -verbose
             git remote add github $(ghRepoPath)
 
             Write-verbose -message 'listing remotes' -verbose
             git remote -v
 
-            Write-verbose -message 'fetching master' -verbose
+            Write-verbose -message 'fetching github master' -verbose
             git fetch --quiet github master
 
-            Write-verbose -message 'fetching master as githubMaster' -verbose
-            git checkout --quiet -b ghmaster github/master
-        displayName: Checkout GitHub master branch as ghmaster
+            Write-verbose -message 'Checkout master branch as github master' -verbose
+            git checkout --quiet -b master github/master
+        displayName: Checkout GitHub master branch as master
         workingDirectory: '$(repoPath)'
 
       - pwsh: |
             $commitId = git rev-parse --verify HEAD
 
             Write-verbose -message "$commitId -ne $env:commitId" -verbose
 
-            if($commitId -ne $env:commitId)
+            if ($commitId -ne $env:commitId)
             {
-                Write-verbose -message 'pushing with (quiet)...' -verbose
+                Write-verbose -message 'pushing (quiet)...' -verbose
                 git branch
-                git push --quiet origin ghmaster
+                git push --quiet origin master
             }
             else
             {
diff --git a/.ci/threadJobMirror.yml b/.ci/threadJobMirror.yml
@@ -10,15 +10,15 @@ schedules:
 - cron: 0 8 * * *
   branches:
     include:
-    - refs/heads/ghmaster
+    - refs/heads/master
   always: true
 
 resources:
   repositories:
     - repository: ThreadJob
       type: git
       name: ThreadJob
-      ref: ghmaster
+      ref: master
     - repository: ThreadJob-gh
       ref: master
       type: github
