From 234e14152024d9c649a4a45c2b8b5fce82ec65bf Mon Sep 17 00:00:00 2001 From: temp Date: Fri, 20 Oct 2023 14:09:49 -0400 Subject: [PATCH 1/3] no-op commit due to failed cherry-picking --- .github/scripts/verify_envoy_version.sh | 5 +++++ .github/workflows/verify-envoy-version.yml | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/.github/scripts/verify_envoy_version.sh b/.github/scripts/verify_envoy_version.sh index 773431f50bc8..bfbd969d4baa 100755 --- a/.github/scripts/verify_envoy_version.sh +++ b/.github/scripts/verify_envoy_version.sh @@ -17,6 +17,11 @@ if [ -z "$current_branch" ]; then exit 1 fi +if [[ "$SKIP_VERIFY_ENVOY_VERSION" = "true" ]]; then + echo -e "*************** VERIFY ENVOY VERSION IS DISABLED. To enable, update environment variable in Github settings *****************" + exit 0 +fi + # Get Consul and Envoy version SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" pushd $SCRIPT_DIR/../.. # repository root diff --git a/.github/workflows/verify-envoy-version.yml b/.github/workflows/verify-envoy-version.yml index d097e335d37b..cf87959ad4dc 100644 --- a/.github/workflows/verify-envoy-version.yml +++ b/.github/workflows/verify-envoy-version.yml @@ -13,6 +13,10 @@ on: branches: - main - release/** + - disable_envoy_check + +env: + SKIP_VERIFY_ENVOY_VERSION: ${{ vars.SKIP_VERIFY_ENVOY_VERSION }} jobs: verify-envoy-version: From ce2b615e6e652e93eaf7c1c6ce91eb6e7211e59d Mon Sep 17 00:00:00 2001 From: Anita Akaeze Date: Fri, 20 Oct 2023 11:30:23 -0700 Subject: [PATCH 2/3] Update verify-envoy-version.yml --- .github/workflows/verify-envoy-version.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/verify-envoy-version.yml b/.github/workflows/verify-envoy-version.yml index cf87959ad4dc..7c46453aec12 100644 --- a/.github/workflows/verify-envoy-version.yml +++ b/.github/workflows/verify-envoy-version.yml @@ -13,7 +13,6 @@ on: branches: - main - release/** - - disable_envoy_check env: SKIP_VERIFY_ENVOY_VERSION: ${{ vars.SKIP_VERIFY_ENVOY_VERSION }} @@ -29,4 +28,4 @@ jobs: - name: Run Envoy Version Verification for main and release branches run: ./.github/scripts/verify_envoy_version.sh env: - GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }} From 480a102835faa4d3b8d4d0987c00098980110532 Mon Sep 17 00:00:00 2001 From: Anita Akaeze Date: Fri, 20 Oct 2023 11:30:49 -0700 Subject: [PATCH 3/3] Update verify-envoy-version.yml