From 231ed5f7b1e23188374099d40fcbaf6e2c98dc84 Mon Sep 17 00:00:00 2001 From: Cody Kaup Date: Fri, 18 Oct 2024 10:40:23 -0500 Subject: [PATCH 1/2] Don't run lint-and-test twice on merge --- .github/workflows/lint-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 9463c31b5..24a6a65c5 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -1,5 +1,5 @@ name: Lint and Test -on: [push, merge_group] +on: push permissions: contents: read From d8b30b93a4425c0d4bde9f69324040201b579e4e Mon Sep 17 00:00:00 2001 From: Cody Kaup Date: Fri, 18 Oct 2024 10:40:29 -0500 Subject: [PATCH 2/2] Update job name --- .github/workflows/smoke-test-action-next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-test-action-next.yml b/.github/workflows/smoke-test-action-next.yml index c0c4f7f44..40cec55b1 100755 --- a/.github/workflows/smoke-test-action-next.yml +++ b/.github/workflows/smoke-test-action-next.yml @@ -5,7 +5,7 @@ permissions: contents: read jobs: - lint-and-test: + smoke-test-action-next: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3