Skip to content

Commit

Permalink
deps: Bump com_github_aignas_rules_shellcheck -> 0.2.4 (#30543)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <[email protected]>
  • Loading branch information
phlax authored Oct 27, 2023
1 parent dc61e68 commit 4d94cd4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Shellcheck rules for bazel",
project_desc = "Now you do not need to depend on the system shellcheck version in your bazel-managed (mono)repos.",
project_url = "https://github.com/aignas/rules_shellcheck",
version = "0.1.1",
sha256 = "4e7cc56d344d0adfd20283f7ad8cb4fba822c0b15ce122665b00dd87a27a74b6",
version = "0.2.4",
sha256 = "ce4d0e7a9beb1fb3f0d37424465060491a91dae68de1ef1c92ee57d94c773b46",
strip_prefix = "rules_shellcheck-{version}",
urls = ["https://github.com/aignas/rules_shellcheck/archive/v{version}.tar.gz"],
release_date = "2022-05-30",
urls = ["https://github.com/aignas/rules_shellcheck/archive/{version}.tar.gz"],
release_date = "2023-10-27",
use_category = ["build"],
cpe = "N/A",
license = "MIT",
Expand Down
8 changes: 4 additions & 4 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function bazel_binary_build() {
# The COMPILE_TYPE variable is redundant in this case and is only here for
# readability. It is already set in the .bazelrc config for sizeopt.
COMPILE_TYPE="opt"
CONFIG_ARGS="--config=sizeopt"
CONFIG_ARGS=("--config=sizeopt")
elif [[ "${BINARY_TYPE}" == "fastbuild" ]]; then
COMPILE_TYPE="fastbuild"
fi
Expand All @@ -181,7 +181,7 @@ function bazel_binary_build() {
# This is a workaround for https://github.com/bazelbuild/bazel/issues/11834
[[ -n "${ENVOY_RBE}" ]] && rm -rf bazel-bin/"${ENVOY_BIN}"*

bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" "${BUILD_TARGET}" ${CONFIG_ARGS}
bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" "${BUILD_TARGET}" "${CONFIG_ARGS[@]}"
collect_build_profile "${BINARY_TYPE}"_build

# Copy the built envoy binary somewhere that we can access outside of the
Expand All @@ -191,14 +191,14 @@ function bazel_binary_build() {
if [[ "${COMPILE_TYPE}" == "dbg" || "${COMPILE_TYPE}" == "opt" ]]; then
# Generate dwp file for debugging since we used split DWARF to reduce binary
# size
bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" "${BUILD_DEBUG_INFORMATION}" ${CONFIG_ARGS}
bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" "${BUILD_DEBUG_INFORMATION}" "${CONFIG_ARGS[@]}"
# Copy the debug information
cp -f bazel-bin/"${ENVOY_BIN}".dwp "${FINAL_DELIVERY_DIR}"/envoy.dwp
fi

# Validation tools for the tools image.
bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" \
//test/tools/schema_validator:schema_validator_tool ${CONFIG_ARGS}
//test/tools/schema_validator:schema_validator_tool "${CONFIG_ARGS[@]}"

# Build su-exec utility
bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" external:su-exec
Expand Down
14 changes: 7 additions & 7 deletions ci/windows_ci_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ fi
if [[ $1 == "//source/exe:envoy-static" ]]; then
BUILD_ENVOY_STATIC=1
shift
TEST_TARGETS=$*
TEST_TARGETS=("${@}")
elif [[ $# -gt 0 ]]; then
BUILD_ENVOY_STATIC=0
TEST_TARGETS=$*
TEST_TARGETS=("$@")
else
BUILD_ENVOY_STATIC=1
TEST_TARGETS='//test/...'
TEST_TARGETS=('//test/...')
fi

# Complete envoy-static build
Expand All @@ -97,8 +97,8 @@ if [[ $BUILD_ENVOY_STATIC -eq 1 ]]; then
fi

# Test invocations of known-working tests on Windows
if [[ $TEST_TARGETS == "//test/..." ]]; then
bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" $TEST_TARGETS --test_tag_filters=-skip_on_windows,-fails_on_${FAIL_GROUP} --build_tests_only
if [[ "${TEST_TARGETS[*]}" == "//test/..." ]]; then
bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" "${TEST_TARGETS[@]}" --test_tag_filters=-skip_on_windows,-fails_on_${FAIL_GROUP} --build_tests_only

# Build tests that are known flaky or failing to ensure no compilation regressions
bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //test/... --test_tag_filters=fails_on_${FAIL_GROUP} --build_tests_only
Expand All @@ -108,8 +108,8 @@ if [[ $TEST_TARGETS == "//test/..." ]]; then
# not triggered by envoy-static or //test/... targets and not deliberately tagged skip_on_windows
bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //bazel/... --build_tag_filters=-skip_on_windows
fi
elif [[ -n "$TEST_TARGETS" ]]; then
bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" $TEST_TARGETS --build_tests_only
elif [[ -n "${TEST_TARGETS[*]}" ]]; then
bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" "${TEST_TARGETS[@]}" --build_tests_only
fi

# Summarize known unbuildable or inapplicable tests (example)
Expand Down
2 changes: 1 addition & 1 deletion examples/locality-load-balancing/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ make_healthy backend-local-1-1
make_healthy backend-local-2-1

run_log "Scale backend-local-1 to 5 replicas."
"${DOCKER_COMPOSE[@]}" -p ${NAME} up --scale backend-local-1=5 -d --build
"${DOCKER_COMPOSE[@]}" -p "${NAME}" up --scale backend-local-1=5 -d --build
wait_for 5 check_health backend-local-1-2 healthy
wait_for 5 check_health backend-local-1-3 healthy
wait_for 5 check_health backend-local-1-4 healthy
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/transport_sockets/tls/test_data/certs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ generate_cert_chain() {
ca_name="i$((x - 1))"
fi
echo "$x: $certname $ca_name"
generate_ca $certname $ca_name
generate_ca "$certname" "$ca_name"
done
for x in {1..3}; do
cat "i${x}_cert.pem" >> test_long_cert_chain.pem
Expand Down
2 changes: 1 addition & 1 deletion tools/vscode/refresh_compdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ command -v bazelisk &> /dev/null || bazel_or_isk=bazel
[[ -z "${EXCLUDE_CONTRIB}" ]] || opts="--exclude_contrib"

# Setting TEST_TMPDIR here so the compdb headers won't be overwritten by another bazel run
TEST_TMPDIR=${BUILD_DIR:-/tmp}/envoy-compdb tools/gen_compilation_database.py --vscode --bazel=$bazel_or_isk ${opts}
TEST_TMPDIR=${BUILD_DIR:-/tmp}/envoy-compdb tools/gen_compilation_database.py --vscode --bazel=$bazel_or_isk "${opts}"

# Kill clangd to reload the compilation database
pkill clangd || :

0 comments on commit 4d94cd4

Please sign in to comment.