Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use System.AccessToken instead of github-distro-mixin-password #23166

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Use System.AccessToken instead of github-distro-mixin-password #23166

Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f0e9fb6
add checkout step
cssuh May 18, 2023
bb14412
update distro build to use System_AccessToken
cssuh May 18, 2023
cbfb3a3
change to sql-product-compile
cssuh May 19, 2023
facfb3c
change formatting for env variable
cssuh May 19, 2023
c967f40
add extraheader
cssuh May 19, 2023
ebe2a01
change formatting
cssuh May 19, 2023
c45049b
fix formatting
cssuh May 22, 2023
3bb13ab
fix env var
cssuh May 22, 2023
caffbd0
fix format
cssuh May 22, 2023
9d6db7f
checkout repos
cssuh May 23, 2023
416081d
remove env var
cssuh May 23, 2023
8c7f7a2
move location of repositories
cssuh May 23, 2023
92d2489
print dir of build.sourcesdirectory
cssuh May 23, 2023
d687e30
add git
cssuh May 23, 2023
09a5333
show inside folders
cssuh May 23, 2023
1dfe533
fix format
cssuh May 23, 2023
131e494
fix merge command
cssuh May 23, 2023
7135f1f
try git merge with distro
cssuh May 23, 2023
03409a3
remove test
cssuh May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 6 additions & 17 deletions build/azure-pipelines/distro-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,17 @@ trigger:
pr: none

steps:
- checkout: self
persistCredentials: true

- task: NodeTool@0
inputs:
versionSpec: "16.x"

- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
inputs:
azureSubscription: "vscode-builds-subscription"
KeyVaultName: vscode
SecretsFilter: "github-distro-mixin-password"

- script: |
set -e

cat << EOF > ~/.netrc
machine github.com
login vscode
password $(github-distro-mixin-password)
EOF

git config user.email "vscode@microsoft.com"
git config user.name "VSCode"

git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
git remote add distro "https://$(System_AccessToken)@github.com/$VSCODE_MIXIN_REPO.git"
git fetch distro

# Push main branch into oss/main
Expand All @@ -42,3 +29,5 @@ steps:
git merge $(node -p "require('./package.json').distro")

displayName: Sync & Merge Distro
env:
System_AccessToken: $(System.AccessToken)