Skip to content

Commit 22bcc2c

Browse files
authored
[Ignore] Buildfix backport (#2267)
* Fix node modules in credscan * Allow branch target override * Downgrade vsce
1 parent 99b79f8 commit 22bcc2c

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

.vsts-ci/templates/release-general.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,15 @@ steps:
8383
optionsFTPATH: '$(Build.SourcesDirectory)\tools\terms\FileTypeSet.xml'
8484
# toolVersion: 5.8.2.1
8585

86+
- pwsh: |
87+
Get-ChildItem -Exclude node_modules | Get-ChildItem -Recurse | ForEach-Object FullName > "$env:BUILD_SOURCESDIRECTORY/credscan.tsv"
88+
displayName: Create credscan.tsv as the list of files to scan
89+
8690
- task: CredScan@2
8791
condition: succeededOrFailed()
92+
inputs:
93+
debugMode: false
94+
scanFolder: '$(Build.SourcesDirectory)/credscan.tsv'
8895

8996
# Publish results as artifacts
9097
- task: PublishSecurityAnalysisLogs@3

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"rewire": "~4.0.1",
5959
"tslint": "~5.20.0",
6060
"typescript": "~3.5.3",
61-
"vsce": "~1.68.0",
61+
"vsce": "~1.64.0",
6262
"vscode": "~1.1.36"
6363
},
6464
"extensionDependencies": [

tools/releaseBuild/setVstsVariables.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ $vstsVariables = @{
55
# Use VSTS's API to set an env vars
66
foreach ($var in $vstsVariables.Keys)
77
{
8+
if (Get-Item "env:$var" -ErrorAction Ignore)
9+
{
10+
continue
11+
}
12+
813
$val = $vstsVariables[$var]
914
Write-Host "Setting var '$var' to value '$val'"
1015
Write-Host "##vso[task.setvariable variable=$var]$val"

0 commit comments

Comments
 (0)