Skip to content

Commit 378fe67

Browse files
lszomorulszomoru
committed
Switch to a bash script
1 parent eae4e24 commit 378fe67

File tree

3 files changed

+26
-54
lines changed

3 files changed

+26
-54
lines changed

‎build/mixin-completions-core.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Get the OAuth token from the git config
5+
result=$(git config --get-regexp '.*extraheader' '^AUTHORIZATION:')
6+
basicToken=$(echo "$result" | sed 's/.*AUTHORIZATION: basic //')
7+
oauthToken=$(echo "$basicToken" | base64 -d | cut -d':' -f2)
8+
9+
# Get the completions core version from package.json
10+
completionsCoreVersion=$(node -p "require('./package.json').completionsCore")
11+
12+
# Clone the vscode-copilot-completions repository
13+
git clone -b completions-port "https://vscode:$oauthToken@github.com/microsoft/vscode-copilot-completions.git" --depth 1 src/extension/completions-core
14+
15+
# Navigate to the cloned directory and checkout the specific version
16+
pushd src/extension/completions-core
17+
git checkout "$completionsCoreVersion"
18+
popd
19+
20+
# Remove the existing file and rename the .txt version
21+
rm src/extension/completions/vscode-node/completionsCoreContribution.ts
22+
mv src/extension/completions/vscode-node/completionsCoreContribution.ts.txt src/extension/completions/vscode-node/completionsCoreContribution.ts

‎build/pre-release.yml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ extends:
8080
displayName: Create build cache archive
8181
8282
- pwsh: |
83-
$ErrorActionPreference = "Stop"
84-
8583
# Get the OAuth token from the git config
8684
$result = git config --get-regexp .*extraheader ^AUTHORIZATION:
8785
$basicToken = $result -split "AUTHORIZATION: basic " | Select-Object -Last 1
@@ -99,19 +97,7 @@ extends:
9997
Remove-Item -Recurse -Force ../vscode-capi
10098
displayName: mixin
10199
102-
- pwsh: |
103-
$ErrorActionPreference = "Stop"
104-
$result = git config --get-regexp .*extraheader ^AUTHORIZATION:
105-
$basicToken = $result -split "AUTHORIZATION: basic " | Select-Object -Last 1
106-
$oauthToken = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($basicToken)) -split ":" | Select-Object -Last 1
107-
$PackageJson = Get-Content -Path package.json -Raw | ConvertFrom-Json
108-
$CompletionsCoreVersion = $PackageJson.completionsCore
109-
git clone -b completions-port https://vscode:[email protected]/microsoft/vscode-copilot-completions.git --depth 1 src/extension/completions-core
110-
pushd src/extension/completions-core
111-
git checkout $CompletionsCoreVersion
112-
popd
113-
rm src/extension/completions/vscode-node/completionsCoreContribution.ts
114-
mv src/extension/completions/vscode-node/completionsCoreContribution.ts.txt src/extension/completions/vscode-node/completionsCoreContribution.ts
100+
- script: ./build/mixin-completions-core.sh
115101
condition: and(succeeded(), eq(${{ parameters.mixinCompletionsCore }}, true))
116102
displayName: Mixin the completions core repo
117103

@@ -179,19 +165,7 @@ extends:
179165
- script: npm run setup:dotnet
180166
displayName: Install dotnet cli
181167

182-
- pwsh: |
183-
$ErrorActionPreference = "Stop"
184-
$result = git config --get-regexp .*extraheader ^AUTHORIZATION:
185-
$basicToken = $result -split "AUTHORIZATION: basic " | Select-Object -Last 1
186-
$oauthToken = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($basicToken)) -split ":" | Select-Object -Last 1
187-
$PackageJson = Get-Content -Path package.json -Raw | ConvertFrom-Json
188-
$CompletionsCoreVersion = $PackageJson.completionsCore
189-
git clone -b completions-port https://vscode:[email protected]/microsoft/vscode-copilot-completions.git --depth 1 src/extension/completions-core
190-
pushd src/extension/completions-core
191-
git checkout $CompletionsCoreVersion
192-
popd
193-
rm src/extension/completions/vscode-node/completionsCoreContribution.ts
194-
mv src/extension/completions/vscode-node/completionsCoreContribution.ts.txt src/extension/completions/vscode-node/completionsCoreContribution.ts
168+
- script: ./build/mixin-completions-core.sh
195169
condition: and(succeeded(), eq(${{ parameters.mixinCompletionsCore }}, true))
196170
displayName: Mixin the completions core repo
197171

‎build/release.yml‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,7 @@ extends:
101101
Remove-Item -Recurse -Force ../vscode-capi
102102
displayName: mixin
103103
104-
- pwsh: |
105-
$ErrorActionPreference = "Stop"
106-
$result = git config --get-regexp .*extraheader ^AUTHORIZATION:
107-
$basicToken = $result -split "AUTHORIZATION: basic " | Select-Object -Last 1
108-
$oauthToken = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($basicToken)) -split ":" | Select-Object -Last 1
109-
$PackageJson = Get-Content -Path package.json -Raw | ConvertFrom-Json
110-
$CompletionsCoreVersion = $PackageJson.completionsCore
111-
git clone -b completions-port https://vscode:[email protected]/microsoft/vscode-copilot-completions.git --depth 1 src/extension/completions-core
112-
pushd src/extension/completions-core
113-
git checkout $CompletionsCoreVersion
114-
popd
115-
rm src/extension/completions/vscode-node/completionsCoreContribution.ts
116-
mv src/extension/completions/vscode-node/completionsCoreContribution.ts.txt src/extension/completions/vscode-node/completionsCoreContribution.ts
104+
- script: ./build/mixin-completions-core.sh
117105
condition: and(succeeded(), eq(${{ parameters.mixinCompletionsCore }}, true))
118106
displayName: Mixin the completions core repo
119107

@@ -181,19 +169,7 @@ extends:
181169
- script: npm run setup:dotnet
182170
displayName: Install dotnet cli
183171

184-
- pwsh: |
185-
$ErrorActionPreference = "Stop"
186-
$result = git config --get-regexp .*extraheader ^AUTHORIZATION:
187-
$basicToken = $result -split "AUTHORIZATION: basic " | Select-Object -Last 1
188-
$oauthToken = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($basicToken)) -split ":" | Select-Object -Last 1
189-
$PackageJson = Get-Content -Path package.json -Raw | ConvertFrom-Json
190-
$CompletionsCoreVersion = $PackageJson.completionsCore
191-
git clone -b completions-port https://vscode:[email protected]/microsoft/vscode-copilot-completions.git --depth 1 src/extension/completions-core
192-
pushd src/extension/completions-core
193-
git checkout $CompletionsCoreVersion
194-
popd
195-
rm src/extension/completions/vscode-node/completionsCoreContribution.ts
196-
mv src/extension/completions/vscode-node/completionsCoreContribution.ts.txt src/extension/completions/vscode-node/completionsCoreContribution.ts
172+
- script: ./build/mixin-completions-core.sh
197173
condition: and(succeeded(), eq(${{ parameters.mixinCompletionsCore }}, true))
198174
displayName: Mixin the completions core repo
199175

0 commit comments

Comments
 (0)