From 735c74d7029ce3aa4c2d7f2809442ba622d27804 Mon Sep 17 00:00:00 2001 From: Scott Prutton Date: Tue, 2 Jul 2024 13:00:48 -0400 Subject: [PATCH 1/2] test --- bin/veritech/src/args.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/veritech/src/args.rs b/bin/veritech/src/args.rs index 6cfe1af33a..d8d43ad410 100644 --- a/bin/veritech/src/args.rs +++ b/bin/veritech/src/args.rs @@ -54,6 +54,7 @@ pub(crate) struct Args { hide_env_values = true )] pub(crate) log_json: bool, + pub(crate) log_json_test: bool, /// NATS connection URL [example: 0.0.0.0:4222] #[arg(long, short = 'u')] From 97daac8c877b5a6a97a249317bec69d9150b16de Mon Sep 17 00:00:00 2001 From: Scott Prutton Date: Tue, 2 Jul 2024 13:27:21 -0400 Subject: [PATCH 2/2] fix labeller --- .github/labeler.yml | 365 ++++++++++++++++++++-------------- .github/workflows/labeler.yml | 5 +- 2 files changed, 219 insertions(+), 151 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index fb47acf577..649519c8b6 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,202 +1,269 @@ ---- # # Project infrastructure # A-ci: - - .ci/**/* - - .github/**/* - - Makefile - - ./**/Makefile + - changed-files: + - any-glob-to-any-file: + - .ci/**/* + - .github/**/* + - Makefile + - ./**/Makefile A-docs: - - docs/**/* + - changed-files: + - any-glob-to-any-file: + - docs/**/* # # System Initiative apps (i.e. webapps/ios apps/android apps) # A-web: - - app/web/**/* - - .prettierrc.js + - changed-files: + - any-glob-to-any-file: + - app/web/**/* + - .prettierrc.js # # System Initiative bins (i.e. services/programs/binaries) # A-cyclone: - - bin/cyclone/**/* - - lib/cyclone-client/**/* - - lib/cyclone-core/**/* - - lib/cyclone-server/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - bin/cyclone/**/* + - lib/cyclone-client/**/* + - lib/cyclone-core/**/* + - lib/cyclone-server/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-sdf: - - bin/sdf/**/* - - lib/sdf-server/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - bin/sdf/**/* + - lib/sdf-server/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-veritech: - - bin/veritech/**/* - - lib/veritech-client/**/* - - lib/veritech-core/**/* - - lib/veritech-server/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - bin/veritech/**/* + - lib/veritech-client/**/* + - lib/veritech-core/**/* + - lib/veritech-server/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-pinga: - - bin/pinga/**/* - - lib/pinga-server/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - bin/pinga/**/* + - lib/pinga-server/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-lang-js: - - bin/lang-js/**/* - - .prettierrc.js + - changed-files: + - any-glob-to-any-file: + - bin/lang-js/**/* + - .prettierrc.js A-module-index: - - bin/module-index/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - bin/module-index/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-discord-bot: - - bin/si-discord-bot/**/* - - .prettierrc.js + - changed-files: + - any-glob-to-any-file: + - bin/si-discord-bot/**/* + - .prettierrc.js A-si: - - bin/si/**/* - - lib/si-cli/**/* + - changed-files: + - any-glob-to-any-file: + - bin/si/**/* + - lib/si-cli/**/* A-rebaser: - - bin/rebaser/**/* - - lib/rebaser-server/**/* - - lib/rebaser-core/**/* - - lib/rebaser-client/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - bin/rebaser/**/* + - lib/rebaser-server/**/* + - lib/rebaser-core/**/* + - lib/rebaser-client/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml # # System Initiative libs (i.e. crates/packages/libraries) # A-buck2-resources: - - lib/A-buck2-resources/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/A-buck2-resources/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-bytes-lines-codec: - - lib/bytes-lines-codec/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/bytes-lines-codec/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-config-file: - - lib/config-file/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/config-file/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-dal: - - lib/dal/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/dal/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-dal-test: - - lib/dal-test/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/dal-test/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-nats-subscriber: - - lib/nats-subscriber/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/nats-subscriber/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-object-tree: - - lib/object-tree/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/object-tree/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-data-nats: - - lib/si-data-nats/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-data-nats/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-data-pg: - - lib/si-data-pg/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-data-pg/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-layer-cache: - - lib/si-layer-cache/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-layer-cache/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-pkg: - - lib/si-pkg/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-pkg/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-pool-noodle: - - lib/si-pool-noodle/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-pool-noodle/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-posthog-rs: - - lib/si-posthog-rs/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-posthog-rs/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-settings: - - lib/si-settings/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-settings/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-std: - - lib/si-std/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-std/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-si-test-macros: - - lib/si-test-macros/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/si-test-macros/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-telemetry-application-rs: - - lib/telemetry-application-rs/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/telemetry-application-rs/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml A-telemetry-rs: - - lib/telemetry-rs/**/* - - .cargo/**/* - - Cargo.lock - - rust-toolchain - - rustfmt.toml + - changed-files: + - any-glob-to-any-file: + - lib/telemetry-rs/**/* + - .cargo/**/* + - Cargo.lock + - rust-toolchain + - rustfmt.toml # # Third-party development images # A-nats: - - component/nats/**/* + - changed-files: + - any-glob-to-any-file: + - component/nats/**/* A-otelcol: - - component/otelcol/**/* + - changed-files: + - any-glob-to-any-file: + - component/otelcol/**/* A-postgres: - - component/postgres/**/* + - changed-files: + - any-glob-to-any-file: + - component/postgres/**/* A-skopeo: - - component/skopeo/**/* + - changed-files: + - any-glob-to-any-file: + - component/skopeo/**/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index fd39e335f7..e6cb6f6bdb 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,7 +1,7 @@ name: labeler on: - - pull_request_target + - pull_request jobs: label: @@ -10,6 +10,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/checkout@v4 + - uses: actions/labeler@v5 with: repo-token: "${{ secrets.GITHUB_TOKEN }}"