Merge remote-tracking branch 'origin/master' into ticket/SG-41264

Author: julien-lang

resources/python/pipelines/pipelines.yml

@@ -21,6 +21,8 @@ jobs:
       git checkout ${{ parameters.branch }} || git checkout $(System.PullRequest.SourceBranch) && git checkout -b ${{ parameters.branch }}
       git merge origin/$(System.PullRequest.SourceBranch)
       git push -u origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Create branch if not exists or update
   - script: |
       set -e
@@ -33,6 +35,8 @@ jobs:
       ./install_source_only.sh
       git commit --allow-empty -a -m "Update source requirements 3.7"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update source requirements 3.7
     workingDirectory: resources/python
 
@@ -57,6 +61,8 @@ jobs:
       ./install_source_only.sh
       git commit --allow-empty -a -m "Update source requirements 3.9"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update source requirements 3.9
     workingDirectory: resources/python
 
@@ -81,6 +87,8 @@ jobs:
       ./install_source_only.sh
       git commit --allow-empty -a -m "Update source requirements 3.10"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update source requirements 3.10
     workingDirectory: resources/python
 
@@ -105,6 +113,8 @@ jobs:
       ./install_source_only.sh
       git commit --allow-empty -a -m "Update source requirements 3.11"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update source requirements 3.11
     workingDirectory: resources/python
 
@@ -128,6 +138,8 @@ jobs:
       ./install_binary_mac.sh
       git commit --allow-empty -a -m "Update binary requirements in Mac Python 3.7"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -147,6 +159,8 @@ jobs:
       ./install_binary_mac.sh
       git commit --allow-empty -a -m "Update binary requirements in Mac Python 3.9"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -166,6 +180,8 @@ jobs:
       ./install_binary_mac.sh
       git commit --allow-empty -a -m "Update binary requirements in Mac Python 3.10"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -185,6 +201,8 @@ jobs:
       ./install_binary_mac.sh
       git commit --allow-empty -a -m "Update binary requirements in Mac Python 3.11"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -206,6 +224,8 @@ jobs:
       ./install_binary_linux.sh
       git commit --allow-empty -a -m "Update binary requirements in Linux Python 3.7"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -225,6 +245,8 @@ jobs:
       ./install_binary_linux.sh
       git commit --allow-empty -a -m "Update binary requirements in Linux Python 3.9"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -244,6 +266,8 @@ jobs:
       ./install_binary_linux.sh
       git commit --allow-empty -a -m "Update binary requirements in Linux Python 3.10"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -263,6 +287,8 @@ jobs:
       ./install_binary_linux.sh
       git commit --allow-empty -a -m "Update binary requirements in Linux Python 3.11"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Update binary requirements
     workingDirectory: resources/python
 
@@ -288,6 +314,8 @@ jobs:
   - script: |
       git commit --allow-empty -a -m "Update binary requirements in Windows Python 3.7"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Run Push Scripts
     workingDirectory: resources/python
 
@@ -311,6 +339,8 @@ jobs:
   - script: |
       git commit --allow-empty -a -m "Update binary requirements in Windows Python 3.9"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Run Push Scripts
     workingDirectory: resources/python
 
@@ -334,6 +364,8 @@ jobs:
   - script: |
       git commit --allow-empty -a -m "Update binary requirements in Windows Python 3.10"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Run Push Scripts
     workingDirectory: resources/python
 
@@ -357,5 +389,7 @@ jobs:
   - script: |
       git commit --allow-empty -a -m "Update binary requirements in Windows Python 3.11"
       git push origin ${{ parameters.branch }}
+    env:
+      GH_ACCESS_TOKEN: $(GITHUB_ACCESS_TOKEN)
     displayName: Run Push Scripts
     workingDirectory: resources/python

resources/python/pipelines/template.yml

@@ -8,12 +8,10 @@ parameters:
   python_version: ""
 
 steps:
-- bash: |
-    git config --global user.name $(GitUserName)
-    git config --global user.email $(GitUserEmail)
-    git remote set-url origin https://$(GitUserName):$(GitToken)@github.com/shotgunsoftware/tk-framework-desktopserver.git
 - task: UsePythonVersion@0
   inputs:
     versionSpec: ${{ parameters.python_version }}
     addToPath: True
     architecture: 'x64'
+
+- template: internal/configure-git.yml@templates