Skip to content

Commit f020bb0

Browse files
authored
Merge pull request #349 from dcillera/my-rebase-1.35-new-boring-hcval
Rebase upstream Envoy 1.35 into envoy-openssl
2 parents 01cfa86 + b07e02d commit f020bb0

File tree

8,518 files changed

+2417103
-661
lines changed

Some content is hidden

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

8,518 files changed

+2417103
-661
lines changed

.bazelrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
549549
common:bes-envoy-engflow --bes_upload_mode=fully_async
550550
common:bes-envoy-engflow --nolegacy_important_outputs
551551
common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
552-
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:95d7afdea0f0f8881e88fa5e581db4f50907d0745ac8d90e00357ac1a316abe5
552+
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://quay.io/jwendell/envoy-build-ubuntu@sha256:a559c5426e1a8c1fc9d6e798b334d643633cc425a2cf49069f3bebe45a2bd28d
553553
common:rbe-envoy-engflow --jobs=200
554554
common:rbe-envoy-engflow --define=engflow_rbe=true
555555

@@ -589,3 +589,5 @@ try-import %workspace%/repo.bazelrc
589589
try-import %workspace%/clang.bazelrc
590590
try-import %workspace%/user.bazelrc
591591
try-import %workspace%/local_tsan.bazelrc
592+
593+
import %workspace%/openssl/bazelrc

.github/dependabot.yml

Lines changed: 0 additions & 103 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: OpenSSL testing
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
pull_request:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
12+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
13+
14+
15+
jobs:
16+
openssl:
17+
runs-on: ubuntu-22.04
18+
timeout-minutes: 180
19+
permissions:
20+
contents: read
21+
packages: read
22+
if: >-
23+
${{ github.repository == 'envoyproxy/envoy-openssl' }}
24+
steps:
25+
- name: Free disk space
26+
uses: envoyproxy/toolshed/gh-actions/[email protected]
27+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
- run: |
29+
./ci/run_envoy_docker.sh './ci/do_ci.sh gcc //test/...'
30+
env:
31+
BAZEL_BUILD_EXTRA_OPTIONS: >-
32+
--config=remote-envoy-engflow
33+
--config=bes-envoy-engflow
34+
--config=remote-ci
35+
ENVOY_RBE: 1
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
ENVOY_BUILD_IMAGE: quay.io/jwendell/envoy-build-ubuntu:openssl-f4a881a1205e8e6db1a57162faf3df7aed88eae8
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Sync from Upstream (Scheduled)
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
schedule:
8+
- cron: "0 1 * * *"
9+
workflow_dispatch:
10+
11+
concurrency:
12+
group: ${{ github.workflow }}
13+
14+
jobs:
15+
sync:
16+
if: github.repository == 'envoyproxy/envoy-openssl'
17+
runs-on: ubuntu-22.04
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
branch_name:
22+
- release/v1.32
23+
- release/v1.28
24+
steps:
25+
- id: appauth
26+
uses: envoyproxy/toolshed/gh-actions/[email protected]
27+
with:
28+
key: ${{ secrets.ENVOY_CI_UPDATE_BOT_KEY }}
29+
app_id: ${{ secrets.ENVOY_CI_UPDATE_APP_ID }}
30+
31+
# Checkout the branch we're merging into
32+
- name: "Checkout ${{ github.repository }}[${{ matrix.branch_name }}]"
33+
uses: actions/checkout@v4
34+
with:
35+
token: ${{ steps.appauth.outputs.token }}
36+
ref: ${{ matrix.branch_name }}
37+
fetch-depth: 0
38+
39+
# Configure the git user info on the repository
40+
- run: git config user.name "${{ github.actor }}"
41+
- run: git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
42+
43+
# Checkout & run the script from the default branch
44+
- name: 'Checkout ci/envoy-sync-receive.sh'
45+
uses: actions/checkout@v4
46+
with:
47+
ref: ${{ github.event.repository.default_branch }}
48+
sparse-checkout: 'ci/envoy-sync-receive.sh'
49+
sparse-checkout-cone-mode: false
50+
path: '.script'
51+
- run: .script/ci/envoy-sync-receive.sh ${{ matrix.branch_name }}
52+
env:
53+
GH_TOKEN: ${{ steps.appauth.outputs.token }}

.github/workflows/toolchain-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ concurrency:
1616
jobs:
1717
toolchain-test:
1818
runs-on: ubuntu-22.04
19+
if: github.repository == 'envoyproxy/envoy'
1920
strategy:
2021
fail-fast: false
2122
matrix:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ TAGS
4646
clang-tidy-fixes.yaml
4747
clang.bazelrc
4848
user.bazelrc
49-
CMakeLists.txt
49+
openssl.bazelrc
5050
cmake-build-debug
5151
/linux
5252
bazel.output.txt

.gitmodules

Whitespace-only changes.

CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,4 +429,10 @@ extensions/upstreams/tcp @ggreenway @mattklein123
429429
/contrib/dlb @mattklein123 @daixiang0
430430
/contrib/qat/ @giantcroc @soulxu
431431
/contrib/generic_proxy/ @wbpcode @UNOWNED
432-
/contrib/tap_sinks/ @coolg92003 @yiyibaoguo
432+
433+
# The bulk of the files in this envoyproxy/envoy-openssl repository are just
434+
# copied from the upstream envoyproxy/envoy repository by automation.
435+
# Therefore, all of the above code owners should NOT be notified about changes
436+
# to this repository. To achive that, we have a default pattern which overrides
437+
# all the matches from above, and notifies the envoy-openssl-sync team instead.
438+
* @envoyproxy/envoy-openssl-sync

0 commit comments

Comments
 (0)