Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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",
sha256 = "d0a2219b1d9edbc430413127b9e01502bb35b3e0bdd14b5a53ad1c30ee4fda5e",
strip_prefix = "bazel-toolchains-3.1.2",
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",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.2/bazel-toolchains-3.1.2.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.2.tar.gz",
],
)

Expand Down
49 changes: 42 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,49 @@ jobs:
DOCKERHUB_PASSWORD: $(DockerPassword)
GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)

- job: generate_toolchains_linux
dependsOn: "build_container_linux"
pool:
vmImage: 'ubuntu-18.04'
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"
GCR_IMAGE_NAME: envoy-build
OS_FAMILY: linux
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'

- 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:
Expand All @@ -66,14 +101,13 @@ jobs:
DOCKERHUB_PASSWORD: $(DockerPassword)
GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)

- job: generate_toolchains_linux
dependsOn: "build_container_linux"
- job: generate_toolchains_windows
Comment thread
sunjayBhatia marked this conversation as resolved.
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
curl -sSL -o /usr/bin/bazel.exe https://github.com/bazelbuild/bazelisk/releases/download/v1.4.0/bazelisk-windows-amd64.exe
displayName: Install Bazelisk

- task: InstallSSHKey@0
Expand All @@ -88,6 +122,8 @@ jobs:
toolchains/regenerate.sh
env:
COMMIT_TOOLCHAINS: "true"
GCR_IMAGE_NAME: envoy-build-windows
OS_FAMILY: windows
SOURCE_BRANCH: $(Build.SourceBranch)
displayName: Generate toolchains

Expand All @@ -98,4 +134,3 @@ jobs:
- task: PublishBuildArtifacts@1
inputs:
artifactName: 'envoy-build-tools'

33 changes: 0 additions & 33 deletions toolchains/configs/.latest.bazelrc

This file was deleted.

149 changes: 0 additions & 149 deletions toolchains/configs/clang/bazel_3.0.0/cc/BUILD

This file was deleted.

This file was deleted.

This file was deleted.

Loading