Skip to content

Commit

Permalink
Merge branch 'main_v2.0' into main_v2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemccabe committed Nov 14, 2024
2 parents b12fc0d + de1015f commit 4e7b5b5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/trigger_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/checkout@v4
- name: Checkout code from this repo
uses: actions/checkout@v4
# get the develop branch of METplus to get the latest component version script
# use fetch-depth 0 to get all branches
- name: Get METplus repo for component version script
Expand All @@ -45,9 +46,11 @@ jobs:
cmd="$GITHUB_WORKSPACE/METplus/metplus/component_versions.py -i METplotpy -v ${version} -o METplus -f main_v{X}.{Y}"
echo $cmd
metplus_branch=$($cmd)
# TODO: if no branch can be determined, exit and error
echo git -C $GITHUB_WORKSPACE/METplus branch -l ${metplus_branch}
git -C $GITHUB_WORKSPACE/METplus branch -l
branch_exists=$(git -C $GITHUB_WORKSPACE/METplus branch -l ${metplus_branch})
#branch_exists=$(git -C $GITHUB_WORKSPACE/METplus branch -l ${metplus_branch})
branch_exists=$(git -C $GITHUB_WORKSPACE/METplus branch -l main_v5.0)
echo branch exists: ${branch_exists}
if [ -z "${branch_exists}" ]; then
echo "METplus branch ${metplus_branch} does not exist yet"
Expand Down

0 comments on commit 4e7b5b5

Please sign in to comment.