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

build - Update ado tasks for the new arch #1526

Merged
merged 2 commits into from
Jul 25, 2024
Merged

build - Update ado tasks for the new arch #1526

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
5706264
build - Update ado pipelines according to the new arch
jdneo Jul 24, 2024
450c39d
Merge branch 'develop' into cs/update-ci
jdneo Jul 25, 2024
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
56 changes: 31 additions & 25 deletions .azure-pipelines/vscode-gradle-apiscan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,41 @@ extends:
- checkout: self
fetchTags: true
- task: JavaToolInstaller@0
displayName: Install Java 11
displayName: Install Java 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 16.14.2
displayName: Install Node 18.x
inputs:
versionSpec: 18.x
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16493
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Plugin Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/plugins'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server/plugins
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
versionSpec: '16.14.2'
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: 'server.jar'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs
- task: CopyFiles@2
displayName: 'Copy Build Server Runtime Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/runtime'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs/runtime
- task: Gradle@2
displayName: Build
inputs:
Expand All @@ -63,28 +89,8 @@ extends:
- bash: chmod +x gradle-server
workingDirectory: $(Build.SourcesDirectory)/extension/lib
displayName: Set permission
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16493
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server
- task: JavaToolInstaller@0
displayName: Install Java 17
inputs:
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: Gradle@2
displayName: Build
displayName: Build Gradle Build Server Importer
inputs:
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
Expand Down
66 changes: 29 additions & 37 deletions .azure-pipelines/vscode-gradle-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,41 @@ extends:
- checkout: self
fetchTags: false
- task: JavaToolInstaller@0
displayName: Install Java 11
displayName: Install Java 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 18.x
inputs:
versionSpec: 18.x
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16492
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Plugin Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/plugins'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server/plugins
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: 'server.jar'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs
- task: CopyFiles@2
displayName: 'Copy Build Server Runtime Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/runtime'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs/runtime
- task: Gradle@2
displayName: Build
inputs:
Expand All @@ -73,42 +99,8 @@ extends:
cd $(Build.SourcesDirectory)/extension/lib
chmod +x gradle-server
displayName: Set permission
- task: ComponentGovernanceComponentDetection@0
inputs:
scanType: 'Register'
verbosity: 'Verbose'
alertWarningLevel: 'High'
- task: notice@0
displayName: 'NOTICE File Generator'
inputs:
outputformat: 'text'
- task: DownloadPipelineArtifact@2
displayName: Download NOTICE file
inputs:
artifact: 'NOTICE.txt'
path: $(Build.SourcesDirectory)/extension
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16492
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server
- task: JavaToolInstaller@0
displayName: Install Java 17
inputs:
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: Gradle@2
displayName: Build
displayName: Build Gradle Build Server Importer
inputs:
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
Expand Down
52 changes: 29 additions & 23 deletions .azure-pipelines/vscode-gradle-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,41 @@ extends:
- checkout: self
fetchTags: true
- task: JavaToolInstaller@0
displayName: Install Java 11
displayName: Install Java 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 18.x
inputs:
versionSpec: 18.x
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16493
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Plugin Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/plugins'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server/plugins
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: 'server.jar'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs
- task: CopyFiles@2
displayName: 'Copy Build Server Runtime Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/runtime'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs/runtime
- task: Gradle@2
displayName: Build
inputs:
Expand Down Expand Up @@ -122,28 +148,8 @@ extends:
inputs:
artifact: 'NOTICE.txt'
path: $(Build.SourcesDirectory)/extension
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16493
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server
- task: JavaToolInstaller@0
displayName: Install Java 17
inputs:
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: Gradle@2
displayName: Build
displayName: Build Gradle Build Server Importer
inputs:
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
Expand Down
52 changes: 29 additions & 23 deletions .azure-pipelines/vscode-gradle-rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,41 @@ extends:
- checkout: self
fetchTags: true
- task: JavaToolInstaller@0
displayName: Install Java 11
displayName: Install Java 17
inputs:
versionSpec: '11'
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 18.x
inputs:
versionSpec: 18.x
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16493
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Plugin Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/plugins'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server/plugins
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: 'server.jar'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs
- task: CopyFiles@2
displayName: 'Copy Build Server Runtime Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs/runtime'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/gradle-server/build/libs/runtime
- task: Gradle@2
displayName: Build
inputs:
Expand Down Expand Up @@ -117,28 +143,8 @@ extends:
inputs:
artifact: 'NOTICE.txt'
path: $(Build.SourcesDirectory)/extension
- task: DownloadBuildArtifacts@1
displayName: 'Download Build Server Artifacts'
inputs:
buildType: specific
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
pipeline: 16493
downloadType: specific
extractTars: false
- task: CopyFiles@2
displayName: 'Copy Build Server Artifacts'
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
Contents: '**'
TargetFolder: $(Build.SourcesDirectory)/extension/server
- task: JavaToolInstaller@0
displayName: Install Java 17
inputs:
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: Gradle@2
displayName: Build
displayName: Build Gradle Build Server Importer
inputs:
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
Expand Down
4 changes: 2 additions & 2 deletions extension/src/bs/BspProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class BspProxy {
sendInfo("", {
kind: "bspProxy-importerConnectionError",
message: error.message,
errorStack: error.stack ? error.stack.toString() : "",
proxyErrorStack: error.stack ? error.stack.toString() : "",
});
// TODO: Implement more specific error handling logic here
});
Expand All @@ -81,7 +81,7 @@ export class BspProxy {
sendInfo("", {
kind: "bspProxy-importerConnectionError",
message: error.message,
errorStack: error.stack ? error.stack.toString() : "",
proxyErrorStack: error.stack ? error.stack.toString() : "",
});
// TODO: Implement more specific error handling logic here
});
Expand Down
Loading