From f3b72037c291fdb46a34547cc2b0e99b2d0de447 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 11:27:12 +0200 Subject: [PATCH 1/7] buf workspace config --- buf.work.yaml | 4 ++++ lib/vector-core/proto/buf.yaml | 7 +++++++ proto/buf.yaml | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100644 buf.work.yaml create mode 100644 lib/vector-core/proto/buf.yaml create mode 100644 proto/buf.yaml diff --git a/buf.work.yaml b/buf.work.yaml new file mode 100644 index 0000000000000..b7dc0a0792557 --- /dev/null +++ b/buf.work.yaml @@ -0,0 +1,4 @@ +version: v1 +directories: + - proto + - lib/vector-core/proto \ No newline at end of file diff --git a/lib/vector-core/proto/buf.yaml b/lib/vector-core/proto/buf.yaml new file mode 100644 index 0000000000000..1a5194568a90a --- /dev/null +++ b/lib/vector-core/proto/buf.yaml @@ -0,0 +1,7 @@ +version: v1 +breaking: + use: + - FILE +lint: + use: + - DEFAULT diff --git a/proto/buf.yaml b/proto/buf.yaml new file mode 100644 index 0000000000000..47af8191cb75a --- /dev/null +++ b/proto/buf.yaml @@ -0,0 +1,9 @@ +version: v1 +breaking: + use: + - FILE + ignore: + - google +lint: + use: + - DEFAULT From 02ea5db4f6ca2a2536d9d1558a43bcbf3134e528 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 11:32:37 +0200 Subject: [PATCH 2/7] remove ignore dir --- proto/buf.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/proto/buf.yaml b/proto/buf.yaml index 47af8191cb75a..1a5194568a90a 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -2,8 +2,6 @@ version: v1 breaking: use: - FILE - ignore: - - google lint: use: - DEFAULT From fd980fd6d27114d104c90715eeac5517ffdee0be Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 11:37:39 +0200 Subject: [PATCH 3/7] add workflow --- .github/workflows/proto.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/proto.yml diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml new file mode 100644 index 0000000000000..316e79a721d4c --- /dev/null +++ b/.github/workflows/proto.yml @@ -0,0 +1,27 @@ +name: Protobuf Compatibility + +on: + pull_request: + paths: + - "proto/**" + - "lib/vector-core/proto/**" + merge_group: + types: [checks_requested] + +concurrency: + # `github.event.number` exists for pull requests, otherwise fall back to SHA for merge queue + group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.head_sha }} + cancel-in-progress: true + +jobs: + validate-protos: + runs-on: ubuntu-latest + steps: + # Run `git checkout` + - uses: actions/checkout@v3 + # Install the `buf` CLI + - uses: bufbuild/buf-setup-action@v0.5.0 + # Perform breaking change detection against the `master` branch + - uses: bufbuild/buf-breaking-action@v1 + with: + against: "https://github.com/acme/weather.git#branch=master" \ No newline at end of file From e0fc583dab0f1e8402c47214ac6a406634362ee8 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 11:44:29 +0200 Subject: [PATCH 4/7] update action versions --- .github/workflows/proto.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index 316e79a721d4c..dcee5e7287dce 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -20,8 +20,8 @@ jobs: # Run `git checkout` - uses: actions/checkout@v3 # Install the `buf` CLI - - uses: bufbuild/buf-setup-action@v0.5.0 + - uses: bufbuild/buf-setup-action@v1.26.1 # Perform breaking change detection against the `master` branch - - uses: bufbuild/buf-breaking-action@v1 + - uses: bufbuild/buf-breaking-action@v1.1.3 with: against: "https://github.com/acme/weather.git#branch=master" \ No newline at end of file From 9a4d68fed055564a932bb1c974298e426d126928 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 11:45:43 +0200 Subject: [PATCH 5/7] correct repo --- .github/workflows/proto.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index dcee5e7287dce..78a9aece550e9 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -24,4 +24,4 @@ jobs: # Perform breaking change detection against the `master` branch - uses: bufbuild/buf-breaking-action@v1.1.3 with: - against: "https://github.com/acme/weather.git#branch=master" \ No newline at end of file + against: "https://github.com/vectordotdev/vector.git#branch=master" \ No newline at end of file From eec7e2f5ba37c35568bdae399143c3890c935a6b Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 11:48:37 +0200 Subject: [PATCH 6/7] temporarily remove proto.yml --- .github/workflows/proto.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/proto.yml diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml deleted file mode 100644 index 78a9aece550e9..0000000000000 --- a/.github/workflows/proto.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Protobuf Compatibility - -on: - pull_request: - paths: - - "proto/**" - - "lib/vector-core/proto/**" - merge_group: - types: [checks_requested] - -concurrency: - # `github.event.number` exists for pull requests, otherwise fall back to SHA for merge queue - group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.head_sha }} - cancel-in-progress: true - -jobs: - validate-protos: - runs-on: ubuntu-latest - steps: - # Run `git checkout` - - uses: actions/checkout@v3 - # Install the `buf` CLI - - uses: bufbuild/buf-setup-action@v1.26.1 - # Perform breaking change detection against the `master` branch - - uses: bufbuild/buf-breaking-action@v1.1.3 - with: - against: "https://github.com/vectordotdev/vector.git#branch=master" \ No newline at end of file From b7fd657a605274612ad81e17e3a521ea1333e775 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Wed, 13 Sep 2023 13:07:58 +0200 Subject: [PATCH 7/7] fmt --- buf.work.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buf.work.yaml b/buf.work.yaml index b7dc0a0792557..810b2d4bfce16 100644 --- a/buf.work.yaml +++ b/buf.work.yaml @@ -1,4 +1,4 @@ version: v1 directories: - - proto - - lib/vector-core/proto \ No newline at end of file + - proto + - lib/vector-core/proto