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

Update distro commit to 8c77b1784802cb3c0304e990fdeca1dd823b99c4 #24663

Merged
merged 2 commits into from
Oct 12, 2023
Merged

Update distro commit to 8c77b1784802cb3c0304e990fdeca1dd823b99c4 #24663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84aa8f
update distro commit hash
cssuh Oct 12, 2023
b6f9d7e
remove build step
cssuh Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions build/azure-pipelines/win32/sql-product-build-win32.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ steps:
git merge $(node -p "require('./package.json').distro")
displayName: Merge distro

- powershell: |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this step not needed anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the mixin-quality brings in the files I need (that I have added in ads-release) based on the quality that we specify, instead of merging a specific commit

git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
git fetch distro
git merge ab87de2203e5a9d8377a74725dc6e2258de6da79
condition: eq(variables['VSCODE_QUALITY'], 'agc')
displayName: Merge AGC endpoints

- powershell: |
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "azuredatastudio",
"version": "1.47.0",
"distro": "37199be719d05d53f4eaa7d96018e579021fe3b0",
"distro": "8c77b1784802cb3c0304e990fdeca1dd823b99c4",
"author": {
"name": "Microsoft Corporation"
},
Expand Down