Merge branch 'main' into replace-nghttp2-functions

Signed-off-by: Biren Roy <birenroy@google.com>
envoyproxy · Feb 3, 2023 · e5641f6 · e5641f6
2 parents 21a51b8 + 5622d49
commit e5641f6
Show file tree

Hide file tree

Showing 440 changed files with 13,819 additions and 5,703 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -1,6 +1,7 @@
 # only directories can be ignored, and no globbing
 api
 examples/grpc-bridge/script
+mobile
 tools/clang_tools
 tools/dev/src
 .project
diff --git a/.bazelrc b/.bazelrc
@@ -295,7 +295,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+FROM gcr.io/envoy-ci/envoy-build:7304f974de2724617b7492ccb4c9c58cd420353a
 
 ARG USERNAME=vscode
 ARG USER_UID=501

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -51,11 +51,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/tools/dependency"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "docker"
   directory: "/.devcontainer"
   schedule:

diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -6,6 +6,10 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   androidbuild:
     name: android_build

diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml
@@ -6,6 +6,10 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   kotlintestsmac:
     # revert to //test/kotlin/... once fixed
@@ -80,7 +84,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++

diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -6,13 +6,17 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   asan:
     name: asan
     runs-on: ubuntu-20.04
     timeout-minutes: 180
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++

diff --git a/.github/workflows/cc_tests.yml b/.github/workflows/cc_tests.yml
@@ -6,13 +6,17 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   cctests:
     name: cc_tests
     runs-on: ubuntu-20.04
     timeout-minutes: 120
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v1
     - name: Add safe directory

diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
@@ -2,6 +2,10 @@ on:
   schedule:
   - cron: '0 12 * * 4'
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   CodeQL-Build:
 
@@ -28,7 +32,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@515828d97454b8354517688ddc5b48402b723750
+      uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: cpp
@@ -59,4 +63,4 @@ jobs:
         git clean -xdf
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@515828d97454b8354517688ddc5b48402b723750
+      uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml
@@ -8,6 +8,10 @@ on:
     - 'dependabot/**'
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   CodeQL-Build:
 
@@ -41,7 +45,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@515828d97454b8354517688ddc5b48402b723750
+      uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: cpp
@@ -74,4 +78,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       if: env.BUILD_TARGETS != ''
-      uses: github/codeql-action/analyze@515828d97454b8354517688ddc5b48402b723750
+      uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -6,26 +6,29 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   unittests:
     name: unit_tests
-    runs-on: macos-12
+    runs-on: ubuntu-20.04
     timeout-minutes: 120
+    container:
+      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
     steps:
     - uses: actions/checkout@v1
-    - id: should_run
-      name: 'Check whether to run'
-      run: ./mobile/tools/should_run_ci.sh
-    - name: 'Install dependencies'
-      if: steps.should_run.outputs.run_ci_job == 'true'
-      run: cd mobile && ./ci/mac_ci_setup.sh
+    - name: Add safe directory
+      run: git config --global --add safe.directory /__w/envoy/envoy
     - name: 'Run tests'
-      if: steps.should_run.outputs.run_ci_job == 'true'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd mobile && ./bazelw test \
+            --action_env=LD_LIBRARY_PATH \
+            --test_env=ENVOY_IP_TEST_VERSIONS=v4only \
             --test_output=all \
-            $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \
+            $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-linux") \
             --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
             //test/common/...
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -6,6 +6,10 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   coverage:
     name: coverage
@@ -15,7 +19,7 @@ jobs:
       run:
         shell: bash
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v1
     - name: Add safe directory

diff --git a/.github/workflows/depsreview.yml b/.github/workflows/depsreview.yml
@@ -1,6 +1,10 @@
 name: 'Dependency Review'
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   dependency-review:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,12 +6,16 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   docs:
     runs-on: ubuntu-20.04
     timeout-minutes: 20
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v3
     - name: Add safe directory

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -6,13 +6,17 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   formatall:
     name: format_all
     runs-on: ubuntu-20.04
     timeout-minutes: 45
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CLANG_FORMAT: /opt/llvm/bin/clang-format
         BUILDIFIER_BIN: /usr/local/bin/buildifier

diff --git a/.github/workflows/ios_build.yml b/.github/workflows/ios_build.yml
@@ -6,6 +6,10 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   iosbuild:
     name: ios_build

diff --git a/.github/workflows/ios_tests.yml b/.github/workflows/ios_tests.yml
@@ -6,6 +6,10 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   swifttests:
     name: swift_tests

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -6,13 +6,17 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   sizecurrent:
     name: size_current
     runs-on: ubuntu-20.04
     timeout-minutes: 120
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -26,7 +30,7 @@ jobs:
       run: |
         cd mobile && ./bazelw build \
             --config=sizeopt \
-            --config=remote-ci-linux-clang \
+            --config=release-common \
             --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
             //test/performance:test_binary_size
     - uses: actions/upload-artifact@v3
@@ -38,7 +42,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -54,7 +58,7 @@ jobs:
         git checkout main && git pull origin main
           cd mobile && ./bazelw build \
             --config=sizeopt \
-            --config=remote-ci-linux-clang \
+            --config=release-common \
             --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
             //test/performance:test_binary_size
     - uses: actions/upload-artifact@v3
@@ -67,7 +71,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 30
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v1
     - uses: actions/download-artifact@v3
@@ -86,4 +90,4 @@ jobs:
         zip -9 dist/main.zip dist/main.stripped
         zip -9 dist/current.zip dist/current.stripped
     - name: 'Test size regression'
-      run: cd mobile && ./ci/test_size_regression.sh dist/main.zip dist/current.zip
+      run: cd mobile && ./ci/test_size_regression.sh ../dist/main.zip ../dist/current.zip
diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -6,13 +6,17 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pythontests:
     name: python_tests
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v1
     - name: Add safe directory

diff --git a/.github/workflows/release_validation.yml b/.github/workflows/release_validation.yml
@@ -6,6 +6,10 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   validate_swiftpm_example:
     name: validate_swiftpm_example

diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
@@ -6,13 +6,17 @@ on:
     - main
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   tsan:
     name: tsan
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++