From cddccd3df53fefd462b5eb9aba8d01ecc9efc4b2 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Thu, 21 Apr 2022 18:22:34 -0400 Subject: [PATCH 1/2] Merge latest origin/main + target this branch in CI --- .github/workflows/cli.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 858c25140b..17d90ead7c 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -3,12 +3,12 @@ name: Run Tests on: push: branches: - - master + - v3-dev-main tags: - - v2.* + - v3.* pull_request: branches: - - master + - v3-dev-main jobs: test: From 5be9100fb327395495e708d8398db7ad0885b9d1 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Thu, 21 Apr 2022 18:24:30 -0400 Subject: [PATCH 2/2] Keep CI config compatible with main branch --- .github/workflows/cli.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 17d90ead7c..1cd4bd6915 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -3,11 +3,14 @@ name: Run Tests on: push: branches: + - main - v3-dev-main tags: + - v2.* - v3.* pull_request: branches: + - main - v3-dev-main jobs: