From 978377db3ef63f133fb66bbcd69659d96dcef369 Mon Sep 17 00:00:00 2001 From: Tess Neau Date: Mon, 23 Dec 2024 11:35:44 -0800 Subject: [PATCH 1/3] enhancement(kafka source, kafka sink): enable rdkafka gssapi feature on more platforms --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d693da56644e9..b60a7f8880b7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -453,14 +453,14 @@ all-metrics = ["sinks-metrics", "sources-metrics", "transforms-metrics"] # Target specific release features. # The `make` tasks will select this according to the appropriate triple. # Use this section to turn off or on specific features for specific triples. -target-aarch64-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] -target-aarch64-unknown-linux-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] -target-armv7-unknown-linux-gnueabihf = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] -target-armv7-unknown-linux-musleabihf = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "secrets"] -target-arm-unknown-linux-gnueabi = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] -target-arm-unknown-linux-musleabi = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "secrets"] +target-aarch64-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] +target-aarch64-unknown-linux-musl = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] +target-armv7-unknown-linux-gnueabihf = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] +target-armv7-unknown-linux-musleabihf = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "secrets"] +target-arm-unknown-linux-gnueabi = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] +target-arm-unknown-linux-musleabi = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "secrets"] target-x86_64-unknown-linux-gnu = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "rdkafka?/gssapi-vendored", "secrets"] -target-x86_64-unknown-linux-musl = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] +target-x86_64-unknown-linux-musl = ["api", "api-client", "rdkafka?/cmake_build", "enrichment-tables", "rdkafka?/gssapi-vendored", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] # Does not currently build target-powerpc64le-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka?/cmake_build", "sinks", "sources", "sources-dnstap", "transforms", "unix", "secrets"] # Currently doesn't build due to lack of support for 64-bit atomics From ccc2dd5135c3b63ddcdb29a9d38f53b023b2957f Mon Sep 17 00:00:00 2001 From: Tess Neau Date: Mon, 23 Dec 2024 11:53:08 -0800 Subject: [PATCH 2/3] test the cross-linux job --- .github/workflows/master_merge_queue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml index c09a317bd2deb..133814af27708 100644 --- a/.github/workflows/master_merge_queue.yml +++ b/.github/workflows/master_merge_queue.yml @@ -80,7 +80,7 @@ jobs: cross-linux: # We run cross checks when dependencies change to ensure they still build. # This helps us avoid adopting dependencies that aren't compatible with other architectures. - if: needs.changes.outputs.dependencies == 'true' +# if: needs.changes.outputs.dependencies == 'true' uses: ./.github/workflows/cross.yml needs: changes secrets: inherit From 093f9016fd1ec8fc20385504664afd35982fd56c Mon Sep 17 00:00:00 2001 From: Tess Neau Date: Mon, 23 Dec 2024 12:12:57 -0800 Subject: [PATCH 3/3] disable changes job condition for testing purpose --- .github/workflows/master_merge_queue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml index 133814af27708..575120381e4bf 100644 --- a/.github/workflows/master_merge_queue.yml +++ b/.github/workflows/master_merge_queue.yml @@ -47,7 +47,7 @@ jobs: # If we don't run this job (such as in a pull request), then by consequence all downstream # test jobs are not run. This allows us to not have to check for merge group in each job. changes: - if: ${{ github.event_name == 'merge_group' }} +# if: ${{ github.event_name == 'merge_group' }} uses: ./.github/workflows/changes.yml with: base_ref: ${{ github.event.merge_group.base_ref }}