Skip to content

Commit 981233d

Browse files
authored
Envoy Bump to 1.34.0 (#11)
* Envoy Bump to 1.34.0 * Update ci workflow * Bump ci cache version * Adding CEL * Remove extra changes * Update instructions
1 parent 561badc commit 981233d

File tree

218 files changed

+8748
-2611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+8748
-2611
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
- name: "Install packages"
2222
run: apt-get update && apt-get install -y git
2323
- name: Checkout repository
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
- name: "Gradle cache"
26-
uses: actions/cache@v2
26+
uses: actions/cache@v4
2727
with:
2828
path: |
2929
~/.gradle

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ Major and minor version follow the envoy version against which they are built. T
99

1010
The `tools` directory follows https://github.com/envoyproxy/java-control-plane/commits/main/tools as closely as possible.
1111

12-
1. Update the `API_SHAS` (which are not really just SHAs): run `update-sha.sh MAJOR.MINOR.PATCH`, paste the end of its output to `API_SHAS`.
13-
14-
1. Update the proto files using `update-api.sh`. This will remove the old `src/main/proto` and fetch a new set of protos.
15-
16-
1. Bump the library version accoring to `Versioning` above in `gradle.properties`.
17-
18-
1. Now it should build on CI. Can try locally using `./gradlew assemble`, but see GHA workflow for specific steps.
12+
1. Grab the Commit ID of the envoy version you are going to use and update it into the `API_SHAS` file.
13+
2. Next see its Bazel dependencices `https://github.com/envoyproxy/envoy/blob/{GITHUB_COMMIT_ID}/api/bazel/repository_locations.bzl`
14+
3. Update the remaining SHAs and Versions in the `API_SHAS` file.
15+
4. This is an alternate : you can also use the run `update-sha.sh MAJOR.MINOR.PATCH`, paste the end of its output to `API_SHAS`.
16+
5. Update the proto files using `update-api.sh`. This will remove the old `src/main/proto` and fetch a new set of protos.
17+
6. Bump the library version according to `Versioning` above in `gradle.properties`.
18+
7. Now it should build on CI. Can try locally using `./gradlew assemble`, but see GHA workflow for specific steps.
19+
8. You may need to add or remove protos depending on the failures and you would want to refer to the bazel dependencies file to figure out what failed, finally udpate the scripts to have the change.
1920

2021
Note: until we catch up with Envoy head version, slight adjustments might be needed for these scripts, towards matching upstream more closely.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=1.29.0-2
1+
version=1.34.0-1
22
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

0 commit comments

Comments
 (0)