Skip to content

Commit 2a62420

Browse files
authored
Merge branch 'main' into feature/attach-by-program-name
2 parents 81f63e2 + bb42f2f commit 2a62420

225 files changed

Lines changed: 4166 additions & 1156 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/package-lock.json

Lines changed: 187 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@octokit/rest": "^21.1.1",
1616
"@slack/web-api": "^6.9.1",
1717
"applicationinsights": "^2.5.1",
18-
"axios": "^1.8.2",
18+
"axios": "^1.12.1",
1919
"uuid": "^8.3.2"
2020
},
2121
"devDependencies": {

Build/cg/cg.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ trigger:
44
include:
55
- main
66
- release
7+
- insiders
78

89
schedules:
910
- cron: 30 5 * * 0
@@ -30,13 +31,15 @@ extends:
3031
parameters:
3132
pool:
3233
name: AzurePipelines-EO
33-
image: AzurePipelinesWindows2022compliantGPT
34+
image: 1ESPT-Windows2022
3435
os: windows
3536
sdl:
3637
sourceAnalysisPool:
3738
name: AzurePipelines-EO
38-
image: AzurePipelinesWindows2022compliantGPT
39+
image: 1ESPT-Windows2022
3940
os: windows
41+
binskim:
42+
preReleaseVersion: '4.3.1'
4043
tsa:
4144
enabled: true
4245
config:
@@ -95,9 +98,20 @@ extends:
9598
- script: mkdir $(Build.ArtifactStagingDirectory)\Extension
9699
displayName: Create Extension Staging Directory
97100

98-
- script: yarn run vsix-prepublish
101+
- task: Bash@3
99102
displayName: Build files
100-
workingDirectory: $(Build.SourcesDirectory)\Extension
103+
inputs:
104+
targetType: 'inline'
105+
script: |
106+
export SRC_DIR=$(echo $BUILD_SOURCESDIRECTORY | sed 's|\\|/|g')
107+
cd "$SRC_DIR/Extension"
108+
yarn run vsix-prepublish
109+
if [ $? -ne 0 ]; then
110+
echo "yarn run vsix-prepublish failed, sleeping for 30s before retrying..."
111+
sleep 30
112+
exit 1
113+
fi
114+
retryCountOnTaskFailure: 3
101115

102116
- script: |
103117
cd $(Build.SourcesDirectory)\Extension
@@ -109,4 +123,4 @@ extends:
109123
displayName: Uninstall vsce
110124
inputs:
111125
command: uninstall
112-
arguments: --global @vscode/vsce
126+
arguments: --global @vscode/vsce

0 commit comments

Comments
 (0)