Merge branch 'etcd-io:main' into redwrasse/purge-fnames-logic

CHANGELOG/CHANGELOG-3.4.md

@@ -14,9 +14,9 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/
 - Add [client backoff and retry config options](https://github.com/etcd-io/etcd/pull/17369).
 
 ### Dependencies
-- Compile binaries using [go 1.21.6](https://github.com/etcd-io/etcd/pull/17368).
 - Upgrade [bbolt to 1.3.9](https://github.com/etcd-io/etcd/pull/17484).
 - Compile binaries using [go 1.21.8](https://github.com/etcd-io/etcd/pull/17538).
+- Upgrade [google.golang.org/protobuf to v1.33.0 to address CVE-2024-24786](https://github.com/etcd-io/etcd/pull/17554).
 
 ### Others
 - [Make CGO_ENABLED configurable](https://github.com/etcd-io/etcd/pull/17422).

CHANGELOG/CHANGELOG-3.5.md

@@ -21,9 +21,9 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
   - `--permit-without-stream`
 
 ### Dependencies
-- Compile binaries using [go 1.21.6](https://github.com/etcd-io/etcd/pull/17362).
 - Upgrade [bbolt to v1.3.9](https://github.com/etcd-io/etcd/pull/17483).
 - Compile binaries using [go 1.21.8](https://github.com/etcd-io/etcd/pull/17537).
+- Upgrade [google.golang.org/protobuf to v1.33.0 to address CVE-2024-24786](https://github.com/etcd-io/etcd/pull/17553).
 
 ### Others
 - [Make CGO_ENABLED configurable](https://github.com/etcd-io/etcd/pull/17421).

scripts/codecov_upload.sh

@@ -8,7 +8,7 @@ set -o pipefail
 LOG_FILE=${1:-test-coverage.log}
 
 # We collect the coverage
-COVERDIR=covdir PASSES='build cov' ./scripts/test.sh 2>&1 | tee "${LOG_FILE}"
+GOEXPERIMENT=nocoverageredesign COVERDIR=covdir PASSES='build cov' ./scripts/test.sh 2>&1 | tee "${LOG_FILE}"
 test_success="$?"
 
 # We try to upload whatever we have: