From 2febd61cbd9f457ec12dfee815e59c6865ef171b Mon Sep 17 00:00:00 2001 From: Taylor Barrella Date: Mon, 16 Nov 2020 19:46:45 +0000 Subject: [PATCH 1/3] ci: fix CodeQL-build by removing deprecated set-env command Signed-off-by: Taylor Barrella --- .github/workflows/codeql-push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml index d6110bbddca2..fbe091a90ec0 100644 --- a/.github/workflows/codeql-push.yml +++ b/.github/workflows/codeql-push.yml @@ -24,7 +24,9 @@ jobs: - name: Get build targets run: | . .github/workflows/get_build_targets.sh - echo ::set-env name=BUILD_TARGETS::$(echo $BUILD_TARGETS_LOCAL) + echo 'BUILD_TARGETS<> $GITHUB_ENV + echo $BUILD_TARGETS_LOCAL >> $GITHUB_ENV + echo 'EOF' >> $GITHUB_ENV # If this run was triggered by a pull request event, then checkout # the head of the pull request instead of the merge commit. - run: git checkout HEAD^2 From 3d151ca704ca60b7d0635dc357595b7dd4724490 Mon Sep 17 00:00:00 2001 From: Taylor Barrella Date: Mon, 16 Nov 2020 21:13:40 +0000 Subject: [PATCH 2/3] Test build Signed-off-by: Taylor Barrella --- source/common/http/path_utility.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/source/common/http/path_utility.cc b/source/common/http/path_utility.cc index f12790b41103..c9dd0fe3ef23 100644 --- a/source/common/http/path_utility.cc +++ b/source/common/http/path_utility.cc @@ -13,6 +13,7 @@ namespace Http { namespace { absl::optional canonicalizePath(absl::string_view original_path) { + // Testing build - delete this std::string canonical_path; chromium_url::Component in_component(0, original_path.size()); chromium_url::Component out_component; From 456bf748bc67b99b719ed539ce52386fdbc82ecd Mon Sep 17 00:00:00 2001 From: Taylor Barrella Date: Mon, 16 Nov 2020 21:48:24 +0000 Subject: [PATCH 3/3] Revert "Test build" This reverts commit 3d151ca704ca60b7d0635dc357595b7dd4724490. Signed-off-by: Taylor Barrella --- source/common/http/path_utility.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/source/common/http/path_utility.cc b/source/common/http/path_utility.cc index c9dd0fe3ef23..f12790b41103 100644 --- a/source/common/http/path_utility.cc +++ b/source/common/http/path_utility.cc @@ -13,7 +13,6 @@ namespace Http { namespace { absl::optional canonicalizePath(absl::string_view original_path) { - // Testing build - delete this std::string canonical_path; chromium_url::Component in_component(0, original_path.size()); chromium_url::Component out_component;