Generate Windows toolchain config

.azure-pipelines/generate_toolchains.yml

@@ -0,0 +1,42 @@
+parameters:
+- name: bazeliskInstallCommandPrefix
+  displayName: "Bazelisk Install Command Prefix"
+  type: string
+  default: "sudo"
+- name: bazeliskInstallPath
+  displayName: "Bazelisk Install Path"
+  type: string
+  default: "/usr/local/bin/bazel"
+- name: bazeliskReleaseFilename
+  displayName: "Bazelisk Relase Filename"
+  type: string
+  default: bazelisk-linux-amd64
+- name: osFamily
+  displayName: "OS Family"
+  type: string
+  default: "linux"
+- name: gcrImageName
+  displayName: "GCR Image Name"
+  type: string
+  default: "envoy-build"
+
+steps:
+- bash: |
+    ${{  parameters.bazeliskInstallCommandPrefix  }} curl -sSL -o ${{  parameters.bazeliskInstallPath  }} https://github.com/bazelbuild/bazelisk/releases/download/v1.4.0/${{  parameters.bazeliskReleaseFilename  }}
+    ${{  parameters.bazeliskInstallCommandPrefix  }} chmod +x ${{  parameters.bazeliskInstallPath  }}
+  displayName: Install Bazelisk
+- task: InstallSSHKey@0
+  inputs:
+    hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
+    sshPublicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCns5kFJ6w7c/zH/FYBNvSpqhpSL147fizsru+PYwaw36RMCkJ4wqHVqusq6zF6K8SPloA4AlzPWx50i2NhRj8NEKgg3IkO35uFciEBcTwqr5+o+e96CvryNwGDZfavgUfrMwTQBYWdM7aaBoWUk31zmUixtlalgBEC1JGdEFxYpN3AmqN50mbu9ZvV8IEv8/AInqvqkS+dIzE9EcZQZQ98uDRU99S1YDCcvZO6xidGZz42AbS8CJ6idrreBoqy/eXmgio4YjGGFRnqr1tdXG5GKWSxfcrSC/gE8OzpFTJ1WOWH+SdZCptev8er6MBoFgRNkDhRckzpsAjhIYxSIAaL"
+    sshPassphrase: "$(SshKeyPassphrase)"
+    sshKeySecureFile: id_rsa_envoy_ci
+  condition: ne(variables['Build.Reason'], 'PullRequest')
+- bash: |
+    toolchains/regenerate.sh
+  env:
+    COMMIT_TOOLCHAINS: "true"
+    GCR_IMAGE_NAME: ${{  parameters.gcrImageName }}
+    OS_FAMILY: ${{  parameters.osFamily  }}
+    SOURCE_BRANCH: $(Build.SourceBranch)
+  displayName: Generate toolchains

WORKSPACE

@@ -4,12 +4,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "bazel_toolchains",
-    sha256 = "239a1a673861eabf988e9804f45da3b94da28d1aff05c373b013193c315d9d9e",
-    strip_prefix = "bazel-toolchains-3.0.1",
-    urls = [
-        "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.0.1/bazel-toolchains-3.0.1.tar.gz",
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.0.1.tar.gz",
-    ],
+    sha256 = "5d48b13686081f5d07dbba1271595d1bb2b5fa1d2f8c049ef15011bd4e6bdd19",
+    strip_prefix = "bazel-toolchains-834b89b3f608a9aa4c212e7ee4a05b323b980a85",
+    # 2020-05-21
+    urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/834b89b3f608a9aa4c212e7ee4a05b323b980a85.tar.gz"],
 )
 
 load(

azure-pipelines.yml

@@ -36,14 +36,27 @@ jobs:
       DOCKERHUB_PASSWORD: $(DockerPassword)
       GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
 
+- job: generate_toolchains_linux
+  dependsOn: "build_container_linux"
+  pool:
+    vmImage: 'ubuntu-18.04'
+  steps:
+  - template: .azure-pipelines/generate_toolchains.yml
+    parameters:
+      bazeliskInstallCommandPrefix: "sudo"
+      bazeliskInstallPath: "/usr/local/bin/bazel"
+      bazeliskReleaseFilename: bazelisk-linux-amd64
+      gcrImageName: "envoy-build"
+      osFamily: "linux"
+
 - job: build_container_windows
   strategy:
     matrix:
       windows2019:
         OS_DISTRO: windows2019
         PUSH_GCR_IMAGE: true
         GCR_IMAGE_NAME: envoy-build-windows
-  dependsOn: []
+  dependsOn: "generate_toolchains_linux"
   pool:
     vmImage: 'windows-latest'
   steps:
@@ -66,36 +79,15 @@ jobs:
       DOCKERHUB_PASSWORD: $(DockerPassword)
       GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
 
-- job: generate_toolchains_linux
-  dependsOn: "build_container_linux"
+- job: generate_toolchains_windows
+  dependsOn: "build_container_windows"
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'windows-latest'
   steps:
-  - bash: |
-      sudo curl -sSL -o /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.4.0/bazelisk-linux-amd64
-      sudo chmod +x /usr/local/bin/bazel
-    displayName: Install Bazelisk
-
-  - task: InstallSSHKey@0
-    inputs:
-      hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
-      sshPublicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCns5kFJ6w7c/zH/FYBNvSpqhpSL147fizsru+PYwaw36RMCkJ4wqHVqusq6zF6K8SPloA4AlzPWx50i2NhRj8NEKgg3IkO35uFciEBcTwqr5+o+e96CvryNwGDZfavgUfrMwTQBYWdM7aaBoWUk31zmUixtlalgBEC1JGdEFxYpN3AmqN50mbu9ZvV8IEv8/AInqvqkS+dIzE9EcZQZQ98uDRU99S1YDCcvZO6xidGZz42AbS8CJ6idrreBoqy/eXmgio4YjGGFRnqr1tdXG5GKWSxfcrSC/gE8OzpFTJ1WOWH+SdZCptev8er6MBoFgRNkDhRckzpsAjhIYxSIAaL"
-      sshPassphrase: "$(SshKeyPassphrase)"
-      sshKeySecureFile: id_rsa_envoy_ci
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-  - bash: |
-      toolchains/regenerate.sh
-    env:
-      COMMIT_TOOLCHAINS: "true"
-      SOURCE_BRANCH: $(Build.SourceBranch)
-    displayName: Generate toolchains
-
-  - bash: |
-      git archive HEAD | gzip > $(Build.ArtifactStagingDirectory)/envoy-build-tools.tar.gz
-    displayName: Create artifacts
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      artifactName: 'envoy-build-tools'
-
+  - template: .azure-pipelines/generate_toolchains.yml
+    parameters:
+      bazeliskInstallCommandPrefix: ""
+      bazeliskInstallPath: "/usr/bin/bazel.exe"
+      bazeliskReleaseFilename: bazelisk-windows-amd64.exe
+      gcrImageName: "envoy-build-windows"
+      osFamily: "windows"