From 0ae224faf940d406f4a6e507289d08d63d6d0256 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Mon, 17 Jun 2024 19:53:35 +0000 Subject: [PATCH] Per #2856, update the testing.yml workflow dispatch option to let the comparison branch be manually defined. --- .github/jobs/set_job_controls.sh | 9 +++++++++ .github/workflows/testing.yml | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh index 76a123d18b..4abad96259 100755 --- a/.github/jobs/set_job_controls.sh +++ b/.github/jobs/set_job_controls.sh @@ -91,6 +91,15 @@ elif [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then run_diff=true fi + truth_data_version=${force_compare_branch} + + # if main_vX.Y branch, use X.Y input data + if [ "${force_ref_branch:0:6}" == "main_v" ]; then + input_data_version=${force_compare_branch:6} + else + input_data_version=${force_compare_branch} + fi + fi # if updating truth or running diff, run unit tests diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index cc8c414fe7..225474a59b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -37,8 +37,13 @@ on: inputs: force_tests: description: 'Run the unit tests' - default: true type: boolean + default: true + force_compare_branch: + description: 'Branch name for input data and output comparison' + type: string + default: develop + required: true env: DOCKERHUB_REPO: dtcenter/met-dev @@ -57,6 +62,7 @@ jobs: env: commit_msg: ${{ github.event.head_commit.message }} force_tests: ${{ github.event.inputs.force_tests }} + force_compare_branch: ${{ github.event.inputs.force_compare_branch }} outputs: run_compile: ${{ steps.job_status.outputs.run_compile }}