Skip to content

Commit

Permalink
ci/tools: Add tarball unpacker (envoyproxy#29899)
Browse files Browse the repository at this point in the history
Signed-off-by: phlax <[email protected]>

Signed-off-by: Ryan Northey <[email protected]>
  • Loading branch information
phlax committed Oct 3, 2023
1 parent 334b235 commit a8ee72b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 51 deletions.
6 changes: 3 additions & 3 deletions api/bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "envoy_toolshed",
project_desc = "Tooling, libraries, runners and checkers for Envoy proxy's CI",
project_url = "https://github.com/envoyproxy/toolshed",
version = "0.0.6",
sha256 = "7047db983e49290ac14b2733459d439a8a521ff49e95fbd0b185a692bd6a6d86",
version = "0.0.10",
sha256 = "bdfcf0a23c18a99887ac25761aa56d85bedb6eda77c89f9f19e6142b812749b9",
strip_prefix = "toolshed-bazel-v{version}/bazel",
urls = ["https://github.com/envoyproxy/toolshed/archive/bazel-v{version}.tar.gz"],
use_category = ["build"],
release_date = "2023-09-24",
release_date = "2023-10-02",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/envoyproxy/envoy/blob/bazel-v{version}/LICENSE",
Expand Down
10 changes: 6 additions & 4 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,6 @@ case $CI_TARGET in
setup_clang_toolchain
echo "generating docs..."
# Build docs.
# We want the binary at the end
BAZEL_BUILD_OPTIONS+=(--remote_download_toplevel)
[[ -z "${DOCS_OUTPUT_DIR}" ]] && DOCS_OUTPUT_DIR=generated/docs
rm -rf "${DOCS_OUTPUT_DIR}"
mkdir -p "${DOCS_OUTPUT_DIR}"
Expand All @@ -663,8 +661,12 @@ case $CI_TARGET in
bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //docs:rst
cp bazel-bin/docs/rst.tar.gz "$DOCS_OUTPUT_DIR"/envoy-docs-rst.tar.gz
fi
bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //docs:html
tar -xzf bazel-bin/docs/html.tar.gz -C "$DOCS_OUTPUT_DIR"
DOCS_OUTPUT_DIR="$(realpath "$DOCS_OUTPUT_DIR")"
bazel "${BAZEL_STARTUP_OPTIONS[@]}" run \
"${BAZEL_BUILD_OPTIONS[@]}" \
--//tools/tarball:target=//docs:html \
//tools/tarball:unpack \
"$DOCS_OUTPUT_DIR"
;;

docs-upload)
Expand Down
44 changes: 0 additions & 44 deletions mobile/docs/publish.sh

This file was deleted.

8 changes: 8 additions & 0 deletions tools/tarball/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
load("@envoy_toolshed//tarball:macros.bzl", "unpacker")

licenses(["notice"]) # Apache 2

unpacker(
name = "unpack",
zstd = "//tools/zstd",
)

0 comments on commit a8ee72b

Please sign in to comment.