From 66128f3b6e02c37c6feeafc96bad325cf98f8f4e Mon Sep 17 00:00:00 2001 From: nfuden Date: Mon, 14 Oct 2024 12:36:05 -0400 Subject: [PATCH 1/2] bump upstream to 1.31.2 and a bit for ci and checksum changes --- bazel/repository_locations.bzl | 4 ++-- changelog/v1.31.2-patch3/bumpforci.yaml | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 changelog/v1.31.2-patch3/bumpforci.yaml diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 4508c9b2..ad3c4d5d 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -2,8 +2,8 @@ REPOSITORY_LOCATIONS = dict( # can't have more than one comment between envoy line and commit line in # order to accommodate `check_extensions_build_config.sh` envoy = dict( - # envoy v1.31.2 - commit = "cc4a75482810de4b84c301d13deb551bd3147339", + # envoy v1.31.2++ ci and checksums + commit = "d599cb3320b890a6caef865b22d197a2314a5ac4", remote = "https://github.com/envoyproxy/envoy", ), inja = dict( diff --git a/changelog/v1.31.2-patch3/bumpforci.yaml b/changelog/v1.31.2-patch3/bumpforci.yaml new file mode 100644 index 00000000..a62c2f76 --- /dev/null +++ b/changelog/v1.31.2-patch3/bumpforci.yaml @@ -0,0 +1,9 @@ +changelog: + - type: DEPENDENCY_BUMP + issueLink: https://github.com/solo-io/envoy-gloo-ee/issues/845 + dependencyOwner: envoyproxy + dependencyRepo: envoy + dependencyTag: d599cb3320b890a6caef865b22d197a2314a5ac4 + resolvesIssue: false + description: >- + Bump to unblock ci due to checksums \ No newline at end of file From 9aa0e2a59e76c926ac0a0186703a6ff2b2a0665c Mon Sep 17 00:00:00 2001 From: nfuden Date: Mon, 14 Oct 2024 12:37:04 -0400 Subject: [PATCH 2/2] changelog move --- changelog/{v1.31.2-patch3 => v1.31.2-patch2}/bumpforci.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{v1.31.2-patch3 => v1.31.2-patch2}/bumpforci.yaml (100%) diff --git a/changelog/v1.31.2-patch3/bumpforci.yaml b/changelog/v1.31.2-patch2/bumpforci.yaml similarity index 100% rename from changelog/v1.31.2-patch3/bumpforci.yaml rename to changelog/v1.31.2-patch2/bumpforci.yaml