From c7af2fcc9dfbf81b03725e16ba72d742784e30a1 Mon Sep 17 00:00:00 2001 From: Victor Quinn Date: Mon, 7 Oct 2024 15:32:47 -0400 Subject: [PATCH 1/2] Add ci on merge into main --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21a6719..e7bd8e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,10 @@ on: branches: - '**' types: - - opened - - synchronize - - reopened + - [opened, synchronize, reopened] + push: + branches: + - main jobs: build-and-test: From b311cab6eb6bcb3364e3f5d095f55805403ba044 Mon Sep 17 00:00:00 2001 From: Victor Quinn Date: Mon, 7 Oct 2024 15:34:10 -0400 Subject: [PATCH 2/2] Revert change that tried to consolidate --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7bd8e8..b0f0270 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,9 @@ on: branches: - '**' types: - - [opened, synchronize, reopened] + - opened + - synchronize + - reopened push: branches: - main