From c509b0c5baa16ab6699c0547fd221c4a6090d027 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 4 Jul 2019 09:21:51 +0200 Subject: [PATCH] cleanup multiarch --- .../alpine/build.sh} | 0 .../alpine/prebuild.sh} | 0 .../alpine/publish.sh} | 0 .../armhf/build.sh} | 0 .../armhf/prebuild.sh} | 0 .../armhf/publish.sh} | 0 .../linux/product-build-linux-alpine.yml | 119 ------------------ ....yml => product-build-linux-multiarch.yml} | 8 +- build/azure-pipelines/product-build.yml | 4 +- 9 files changed, 6 insertions(+), 125 deletions(-) rename build/azure-pipelines/linux/{build-alpine.sh => multiarch/alpine/build.sh} (100%) rename build/azure-pipelines/linux/{build-arm.sh => multiarch/alpine/prebuild.sh} (100%) rename build/azure-pipelines/linux/{prebuild-alpine.sh => multiarch/alpine/publish.sh} (100%) rename build/azure-pipelines/linux/{prebuild-arm.sh => multiarch/armhf/build.sh} (100%) rename build/azure-pipelines/linux/{publish-alpine.sh => multiarch/armhf/prebuild.sh} (100%) rename build/azure-pipelines/linux/{publish-arm.sh => multiarch/armhf/publish.sh} (100%) delete mode 100644 build/azure-pipelines/linux/product-build-linux-alpine.yml rename build/azure-pipelines/linux/{product-build-linux-arm.yml => product-build-linux-multiarch.yml} (92%) diff --git a/build/azure-pipelines/linux/build-alpine.sh b/build/azure-pipelines/linux/multiarch/alpine/build.sh similarity index 100% rename from build/azure-pipelines/linux/build-alpine.sh rename to build/azure-pipelines/linux/multiarch/alpine/build.sh diff --git a/build/azure-pipelines/linux/build-arm.sh b/build/azure-pipelines/linux/multiarch/alpine/prebuild.sh similarity index 100% rename from build/azure-pipelines/linux/build-arm.sh rename to build/azure-pipelines/linux/multiarch/alpine/prebuild.sh diff --git a/build/azure-pipelines/linux/prebuild-alpine.sh b/build/azure-pipelines/linux/multiarch/alpine/publish.sh similarity index 100% rename from build/azure-pipelines/linux/prebuild-alpine.sh rename to build/azure-pipelines/linux/multiarch/alpine/publish.sh diff --git a/build/azure-pipelines/linux/prebuild-arm.sh b/build/azure-pipelines/linux/multiarch/armhf/build.sh similarity index 100% rename from build/azure-pipelines/linux/prebuild-arm.sh rename to build/azure-pipelines/linux/multiarch/armhf/build.sh diff --git a/build/azure-pipelines/linux/publish-alpine.sh b/build/azure-pipelines/linux/multiarch/armhf/prebuild.sh similarity index 100% rename from build/azure-pipelines/linux/publish-alpine.sh rename to build/azure-pipelines/linux/multiarch/armhf/prebuild.sh diff --git a/build/azure-pipelines/linux/publish-arm.sh b/build/azure-pipelines/linux/multiarch/armhf/publish.sh similarity index 100% rename from build/azure-pipelines/linux/publish-arm.sh rename to build/azure-pipelines/linux/multiarch/armhf/publish.sh diff --git a/build/azure-pipelines/linux/product-build-linux-alpine.yml b/build/azure-pipelines/linux/product-build-linux-alpine.yml deleted file mode 100644 index c89d096e450..00000000000 --- a/build/azure-pipelines/linux/product-build-linux-alpine.yml +++ /dev/null @@ -1,119 +0,0 @@ -steps: -- script: | - mkdir -p .build - echo -n $BUILD_SOURCEVERSION > .build/commit - displayName: Prepare cache flag - -- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: '.build/commit' - targetfolder: '.build, **/out-build' - vstsFeed: 'npm-vscode' - platformIndependent: true - alias: 'Compilation' - -- script: | - set -e - exit 1 - displayName: Check RestoreCache - condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true')) - -- task: NodeTool@0 - inputs: - versionSpec: "10.15.1" - -- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2 - inputs: - versionSpec: "1.10.1" - -- task: AzureKeyVault@1 - displayName: 'Azure Key Vault: Get Secrets' - inputs: - azureSubscription: 'vscode-builds-subscription' - KeyVaultName: vscode - -- task: Docker@1 - displayName: 'Pull image' - inputs: - azureSubscriptionEndpoint: 'vscode-builds-subscription' - azureContainerRegistry: vscodehub.azurecr.io - command: 'Run an image' - imageName: 'vscode-linux-build-agent:alpine' - containerCommand: uname - -- script: | - set -e - - cat << EOF > ~/.netrc - machine monacotools.visualstudio.com - password $(devops-pat) - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF - - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling - -- script: | - set -e - git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" - git fetch distro - git merge $(node -p "require('./package.json').distro") - displayName: Merge distro - -- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: '.yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'npm-vscode' - -- script: | - set -e - yarn --frozen-lockfile - node build/azure-pipelines/common/installDistroDependencies.js - node build/azure-pipelines/common/installDistroDependencies.js remote - displayName: Install dependencies - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - -- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - inputs: - keyfile: '.yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'npm-vscode' - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - -- script: | - set -e - yarn postinstall - displayName: Run postinstall scripts - condition: and(succeeded(), eq(variables['CacheRestored'], 'true')) - -- script: | - set -e - yarn gulp mixin - displayName: Mix in quality - -- script: | - set -e - ./build/azure-pipelines/linux/prebuild-alpine.sh - displayName: Prepare build - -- script: | - set -e - ./build/azure-pipelines/linux/build-alpine.sh - displayName: Build - -- script: | - set -e - AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ - AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ - ./build/azure-pipelines/linux/publish-alpine.sh - displayName: Publish - -- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - continueOnError: true \ No newline at end of file diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-multiarch.yml similarity index 92% rename from build/azure-pipelines/linux/product-build-linux-arm.yml rename to build/azure-pipelines/linux/product-build-linux-multiarch.yml index 169331ef5cd..8365b09a404 100644 --- a/build/azure-pipelines/linux/product-build-linux-arm.yml +++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml @@ -38,7 +38,7 @@ steps: azureSubscriptionEndpoint: 'vscode-builds-subscription' azureContainerRegistry: vscodehub.azurecr.io command: 'Run an image' - imageName: 'vscode-linux-build-agent:armhf' + imageName: 'vscode-linux-build-agent:$(VSCODE_ARCH)' containerCommand: uname - script: | @@ -97,12 +97,12 @@ steps: - script: | set -e - ./build/azure-pipelines/linux/prebuild-arm.sh + ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/prebuild.sh displayName: Prebuild - script: | set -e - ./build/azure-pipelines/linux/build-arm.sh + ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/build.sh displayName: Build - script: | @@ -111,7 +111,7 @@ steps: AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ - ./build/azure-pipelines/linux/publish-arm.sh + ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/publish.sh displayName: Publish - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index f8cb33c7354..ddaabdcdc72 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -75,7 +75,7 @@ jobs: dependsOn: - Compile steps: - - template: linux/product-build-linux-arm.yml + - template: linux/product-build-linux-multiarch.yml - job: LinuxAlpine condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable')) @@ -87,7 +87,7 @@ jobs: dependsOn: - Compile steps: - - template: linux/product-build-linux-alpine.yml + - template: linux/product-build-linux-multiarch.yml - job: macOS condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))