From ffc122dc489f084abc8c3dc51142942c238363f0 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Thu, 25 Jul 2024 19:26:33 +0800 Subject: [PATCH] build - Update ado pipelines according to the new arch (#1526) --- .azure-pipelines/vscode-gradle-apiscan.yml | 56 ++++++++++-------- .azure-pipelines/vscode-gradle-ci.yml | 66 ++++++++++------------ .azure-pipelines/vscode-gradle-nightly.yml | 52 +++++++++-------- .azure-pipelines/vscode-gradle-rc.yml | 52 +++++++++-------- extension/src/bs/BspProxy.ts | 4 +- 5 files changed, 120 insertions(+), 110 deletions(-) diff --git a/.azure-pipelines/vscode-gradle-apiscan.yml b/.azure-pipelines/vscode-gradle-apiscan.yml index 245c26af..6a9d8914 100644 --- a/.azure-pipelines/vscode-gradle-apiscan.yml +++ b/.azure-pipelines/vscode-gradle-apiscan.yml @@ -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: '16.14.2' + 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: @@ -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' diff --git a/.azure-pipelines/vscode-gradle-ci.yml b/.azure-pipelines/vscode-gradle-ci.yml index 9d7c5be5..6812983c 100644 --- a/.azure-pipelines/vscode-gradle-ci.yml +++ b/.azure-pipelines/vscode-gradle-ci.yml @@ -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: @@ -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' diff --git a/.azure-pipelines/vscode-gradle-nightly.yml b/.azure-pipelines/vscode-gradle-nightly.yml index b15a0248..51c1c006 100644 --- a/.azure-pipelines/vscode-gradle-nightly.yml +++ b/.azure-pipelines/vscode-gradle-nightly.yml @@ -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: @@ -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' diff --git a/.azure-pipelines/vscode-gradle-rc.yml b/.azure-pipelines/vscode-gradle-rc.yml index af99f5c4..b5cffaa6 100644 --- a/.azure-pipelines/vscode-gradle-rc.yml +++ b/.azure-pipelines/vscode-gradle-rc.yml @@ -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: @@ -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' diff --git a/extension/src/bs/BspProxy.ts b/extension/src/bs/BspProxy.ts index 4ab77080..060325d0 100644 --- a/extension/src/bs/BspProxy.ts +++ b/extension/src/bs/BspProxy.ts @@ -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 }); @@ -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 });