From 1e0a2db9c46e2f4c468be5f658f0d6830d35e597 Mon Sep 17 00:00:00 2001 From: Jon Vanausdeln Date: Mon, 18 Nov 2024 10:40:43 -0800 Subject: [PATCH] add prerelease branched to merge workflow (#5388) ### Intent Similar to https://github.com/posit-dev/positron/pull/5352, we should run full test suite when merging to prerelease branches. This will help with catching issues when we aren't running the nightly full tests against the branch. ### QA Notes Tests run when merging to prerelease branch. This will be hard to test until a change to a prerelease branch is made. --- ...{positron-merge-to-main.yml => positron-merge-to-branch.yml} | 1 + .github/workflows/positron-pull-requests.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename .github/workflows/{positron-merge-to-main.yml => positron-merge-to-branch.yml} (99%) diff --git a/.github/workflows/positron-merge-to-main.yml b/.github/workflows/positron-merge-to-branch.yml similarity index 99% rename from .github/workflows/positron-merge-to-main.yml rename to .github/workflows/positron-merge-to-branch.yml index 05926add369..c433102d8ca 100644 --- a/.github/workflows/positron-merge-to-main.yml +++ b/.github/workflows/positron-merge-to-branch.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - 'prerelease/**' workflow_call: inputs: smoketest_target: diff --git a/.github/workflows/positron-pull-requests.yml b/.github/workflows/positron-pull-requests.yml index a0277deb873..ed29e38dfe3 100644 --- a/.github/workflows/positron-pull-requests.yml +++ b/.github/workflows/positron-pull-requests.yml @@ -8,7 +8,7 @@ on: jobs: positron-ci: - uses: ./.github/workflows/positron-merge-to-main.yml + uses: ./.github/workflows/positron-merge-to-branch.yml secrets: inherit with: smoketest_target: smoketest-pr