Skip to content

Bring back the build image tag and fix toolchain config push issues #70

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

Merged
lizan merged 5 commits into from
Jun 4, 2020
Merged

Bring back the build image tag and fix toolchain config push issues #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f107b9
Bring back the build image tag
sunjayBhatia May 27, 2020
a354ed7
Merge branch 'master' into bring-back-image-tag
sunjayBhatia Jun 2, 2020
e1c90c7
Merge branch 'master' into bring-back-image-tag
sunjayBhatia Jun 3, 2020
35b9af3
Move pull to before any modifications
sunjayBhatia Jun 3, 2020
53808e3
Bump vs buildtools installer
sunjayBhatia Jun 3, 2020
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
6 changes: 3 additions & 3 deletions build_container/build_container_windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ DownloadAndCheck C:\tools\bazel\bazel.exe `
AddToPath C:\tools\bazel

# VS 2019 Build Tools
# Pinned to version downloaded on 5/9/2020 via https://aka.ms/vs/16/release/vs_buildtools.exe
# Pinned to version downloaded on 6/3/2020 via https://aka.ms/vs/16/release/vs_buildtools.exe
DownloadAndCheck $env:TEMP\vs_buildtools.exe `
https://download.visualstudio.microsoft.com/download/pr/ac28b571-7709-4635-83d0-6277d6102ecb/ae0caec52ee10d6efc9b855bec5b934cf8054a638e08372e0de4f6351a25ea5d/vs_BuildTools.exe `
ae0caec52ee10d6efc9b855bec5b934cf8054a638e08372e0de4f6351a25ea5d
https://download.visualstudio.microsoft.com/download/pr/17a0244e-301e-4801-a919-f630bc21177d/9821a63671d5768de1920147a2637f0e079c3b1804266c1383f61bb95e2cc18b/vs_BuildTools.exe `
9821a63671d5768de1920147a2637f0e079c3b1804266c1383f61bb95e2cc18b
echo @"
{
"version": "1.0",
Expand Down
2 changes: 2 additions & 0 deletions toolchains/rbe_toolchains_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ load("@envoy_build_tools//toolchains:configs/windows/versions.bzl", _generated_t

_ENVOY_BUILD_IMAGE_REGISTRY = "gcr.io"

_ENVOY_BUILD_IMAGE_TAG = "12b3d2c2ffa582507e5d6dd34632b2b990f1b195"

_ENVOY_BUILD_IMAGE_REPOSITORY_LINUX = "envoy-ci/envoy-build"
_ENVOY_BUILD_IMAGE_DIGEST_LINUX = "sha256:151854af4b9da07f1384c2d5a157bee4a3b5d9d5ce40c978a94ffc426990830e"
_CONFIGS_OUTPUT_BASE_LINUX = "toolchains/configs/linux"
Expand Down
8 changes: 6 additions & 2 deletions toolchains/regenerate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@ if ! docker pull ${DOCKER_IMAGE}; then
exit 0
fi

# If we are committing changes, pull before modifying to ensure no conflicts
if [[ "true" == "${COMMIT_TOOLCHAINS}" ]]; then
git pull origin refs/heads/master --ff-only
fi

UCASE_OS_FAMILY=`echo ${OS_FAMILY} | tr "[:lower:]" "[:upper:]"`
DOCKER_REPODIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' ${DOCKER_IMAGE} | grep -oE 'sha256:[0-9a-f]{64}')

sed -i -E "s#(_ENVOY_BUILD_IMAGE_DIGEST_${UCASE_OS_FAMILY} =) \"sha256:[0-9a-f]{64}\"#\1 \"${DOCKER_REPODIGEST}\"#" toolchains/rbe_toolchains_config.bzl
sed -i -E "s#(_ENVOY_BUILD_IMAGE_TAG =) \"[0-9a-f]{40}\"#\1 \"${CONTAINER_TAG}\"#" toolchains/rbe_toolchains_config.bzl

mkdir -p "${RBE_AUTOCONF_ROOT}/toolchains/configs/${OS_FAMILY}"
rm -rf "${RBE_AUTOCONF_ROOT}/toolchains/configs/${OS_FAMILY}/*"
Expand Down Expand Up @@ -47,8 +53,6 @@ if [[ -z "$(git diff HEAD --name-only)" ]]; then
fi

if [[ "true" == "${COMMIT_TOOLCHAINS}" ]]; then
git pull origin refs/heads/master --ff-only

COMMIT_MSG="Regenerate ${OS_FAMILY} toolchains from $(git rev-parse HEAD)

[skip ci]
Expand Down