From 1cc407805b48cc2f0fbcc2e65cc960d3688b6161 Mon Sep 17 00:00:00 2001 From: Walter Kolczynski - NOAA Date: Thu, 31 Oct 2024 04:11:23 -0400 Subject: [PATCH 01/10] Make wxflow links static instead of from link_workflow (#3008) Commits symlinks to the repo for wxflow instead of relying on link_workflow to create them. This will allow testing in the ci or workflow directory without needing to run an otherwise unnecessary link_workflow first. --- .gitignore | 5 ----- ci/scripts/wxflow | 1 + sorc/link_workflow.sh | 18 ------------------ ush/python/wxflow | 1 + workflow/wxflow | 1 + 5 files changed, 3 insertions(+), 23 deletions(-) create mode 120000 ci/scripts/wxflow create mode 120000 ush/python/wxflow create mode 120000 workflow/wxflow diff --git a/.gitignore b/.gitignore index 8fc6d0b20b..4ec62993d3 100644 --- a/.gitignore +++ b/.gitignore @@ -171,11 +171,6 @@ ush/bufr2ioda_insitu* versions/build.ver versions/run.ver -# wxflow checkout and symlinks -ush/python/wxflow -workflow/wxflow -ci/scripts/wxflow - # jcb checkout and symlinks ush/python/jcb workflow/jcb diff --git a/ci/scripts/wxflow b/ci/scripts/wxflow new file mode 120000 index 0000000000..9dbee42bc8 --- /dev/null +++ b/ci/scripts/wxflow @@ -0,0 +1 @@ +../../sorc/wxflow/src/wxflow \ No newline at end of file diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index 870ddc5eba..3d81f7b7d4 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -86,15 +86,6 @@ esac # Source fix version file source "${HOMEgfs}/versions/fix.ver" -# Link python pacakges in ush/python -# TODO: This will be unnecessary when these are part of the virtualenv -packages=("wxflow") -for package in "${packages[@]}"; do - cd "${HOMEgfs}/ush/python" || exit 1 - [[ -s "${package}" ]] && rm -f "${package}" - ${LINK} "${HOMEgfs}/sorc/${package}/src/${package}" . -done - # Link GDASapp python packages in ush/python packages=("jcb") for package in "${packages[@]}"; do @@ -103,15 +94,6 @@ for package in "${packages[@]}"; do ${LINK} "${HOMEgfs}/sorc/gdas.cd/sorc/${package}/src/${package}" . done -# Link wxflow in workflow and ci/scripts -# TODO: This will be unnecessary when wxflow is part of the virtualenv -cd "${HOMEgfs}/workflow" || exit 1 -[[ -s "wxflow" ]] && rm -f wxflow -${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" . -cd "${HOMEgfs}/ci/scripts" || exit 1 -[[ -s "wxflow" ]] && rm -f wxflow -${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" . - # Link fix directories if [[ -n "${FIX_DIR}" ]]; then if [[ ! -d "${HOMEgfs}/fix" ]]; then mkdir "${HOMEgfs}/fix" || exit 1; fi diff --git a/ush/python/wxflow b/ush/python/wxflow new file mode 120000 index 0000000000..9dbee42bc8 --- /dev/null +++ b/ush/python/wxflow @@ -0,0 +1 @@ +../../sorc/wxflow/src/wxflow \ No newline at end of file diff --git a/workflow/wxflow b/workflow/wxflow new file mode 120000 index 0000000000..7ea96a12bf --- /dev/null +++ b/workflow/wxflow @@ -0,0 +1 @@ +../sorc/wxflow/src/wxflow \ No newline at end of file From 5a8a5aa13b0143c871dc466e0ed062c55c7cd573 Mon Sep 17 00:00:00 2001 From: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:10:07 -0400 Subject: [PATCH 02/10] Fix the name of the TC tracker filenames in archive.py (#3030) This corrects the names of the product files created by the `tracker` job when attempting to rename the experiment and push the file to the `ARCDIR` within the `arch` job. --- ush/python/pygfs/task/archive.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ush/python/pygfs/task/archive.py b/ush/python/pygfs/task/archive.py index d138474e9a..108cd2ed27 100644 --- a/ush/python/pygfs/task/archive.py +++ b/ush/python/pygfs/task/archive.py @@ -88,11 +88,6 @@ def configure(self, arch_dict: Dict[str, Any]) -> (Dict[str, Any], List[Dict[str if not os.path.isdir(arch_dict.ROTDIR): raise FileNotFoundError(f"FATAL ERROR: The ROTDIR ({arch_dict.ROTDIR}) does not exist!") - if arch_dict.RUN in ["gdas", "gfs"]: - - # Copy the cyclone track files and rename the experiments - Archive._rename_cyclone_expt(arch_dict) - # Collect datasets that need to be archived # Each dataset represents one tarball @@ -371,14 +366,14 @@ def _rename_cyclone_expt(arch_dict) -> None: if run == "gfs": in_track_file = (track_dir_in + "/avno.t" + - cycle_HH + "z.cycle.trackatcfunix") + cycle_HH + "z.cyclone.trackatcfunix") in_track_p_file = (track_dir_in + "/avnop.t" + - cycle_HH + "z.cycle.trackatcfunixp") + cycle_HH + "z.cyclone.trackatcfunix") elif run == "gdas": in_track_file = (track_dir_in + "/gdas.t" + - cycle_HH + "z.cycle.trackatcfunix") + cycle_HH + "z.cyclone.trackatcfunix") in_track_p_file = (track_dir_in + "/gdasp.t" + - cycle_HH + "z.cycle.trackatcfunixp") + cycle_HH + "z.cyclone.trackatcfunix") if not os.path.isfile(in_track_file): # Do not attempt to archive the outputs @@ -416,7 +411,7 @@ def replace_string_from_to_file(filename_in, filename_out, search_str, replace_s with open("/tmp/track_file", "w") as new_file: new_file.writelines(out_lines) - shutil.move("tmp/track_file", filename_out) + shutil.move("/tmp/track_file", filename_out) replace_string_from_to_file(in_track_file, out_track_file, "AVNO", pslot4) replace_string_from_to_file(in_track_p_file, out_track_p_file, "AVNO", pslot4) From ca8cd7af51daa20636a2045feb95105dc5c3510d Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Thu, 31 Oct 2024 20:37:07 +0000 Subject: [PATCH 03/10] Auto provisioning of PW clusters from GitHub CI added (#3051) # Description This update to the GitHub dispatched CI pipeline to execute the self-hosted GitHub Runner on Parallel Works now adds the feature that starts up the virtual compute cluster automatically. We now have a complete end-to-end automated process for running CI tests in Parallel Works. Next steps would be tear-down and adding more test to see if it scales. It also has the update for getting a PR to load up when its originating from a forked repo. # Type of change - [ ] Bug fix (fixes something broken) - [x] New feature (adds functionality) - [ ] Maintenance (code refactor, clean-up, new CI test, etc.) # Change characteristics - Is this a breaking change (a change in existing functionality)? NO - Does this change require a documentation update? YES - Does this change require an update to any of the following submodules? NO (If YES, please add a link to any PRs that are pending.) - [ ] EMC verif-global - [ ] GDAS - [ ] GFS-utils - [ ] GSI - [ ] GSI-monitor - [ ] GSI-utils - [ ] UFS-utils - [ ] UFS-weather-model - [ ] wxflow # How has this been tested? The start up aspected has been tested from my forked repo but could not test repos that are forked. The test from forked repos has to be tested once the workflow pipeline in the **develop** branch. # Checklist - [x] Any dependent changes have been merged and published - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have documented my code, including function, input, and output descriptions - [x] My changes generate no new warnings - [x] New and existing tests pass with my changes - [x] This change is covered by an existing CI test or a new one has been added - [ ] Any new scripts have been added to the .github/CODEOWNERS file with owners - [ ] I have made corresponding changes to the system documentation if necessary --------- Co-authored-by: tmcguinness Co-authored-by: tmcguinness --- .github/workflows/pw_aws_ci.yaml | 36 +++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index 245e219dd4..c59f027920 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -31,24 +31,57 @@ env: MACHINE_ID: noaacloud jobs: + + run-start-clusters: + runs-on: ubuntu-latest + env: + PW_PLATFORM_HOST: noaa.parallel.works + steps: + - name: Checkout pw-cluster-automation repository + uses: actions/checkout@v4 + with: + repository: TerrenceMcGuinness-NOAA/pw-cluster-automation + path: pw-cluster-automation + ref: pw_cluster_noaa + + - name: Run startClusters + run: | + mkdir -p ~/.ssh + echo "${{ secrets.ID_RSA_AWS }}" > ~/.ssh/id_rsa + echo "${{ secrets.PW_API_KEY }}" > ~/.ssh/pw_api.key + chmod 700 ~/.ssh + chmod 600 ~/.ssh/id_rsa + chmod 600 ~/.ssh/pw_api.key + if [ "${{ github.event.inputs.os }}" == "rocky" ]; then + clustername="globalworkflowciplatformrocky8" + elif [ "${{ github.event.inputs.os }}" == "centos" ]; then + clustername="awsemctmcgc7i48xlargeciplatform" + fi + python3 pw-cluster-automation/startClusters.py $clustername + fetch-branch: + needs: run-start-clusters runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUBTOKEN }} outputs: branch: ${{ steps.get-branch.outputs.branch }} + repo: ${{ steps.get-branch.outputs.repo }} steps: - - name: Fetch branch name for PR + - name: Fetch branch name and repo for PR id: get-branch run: | pr_number=${{ github.event.inputs.pr_number }} repo=${{ github.repository }} if [ "$pr_number" -eq "0" ]; then branch=${{ github.event.inputs.ref }} + repo_url="https://github.com/${{ github.repository_owner }}/${{ github.repository }}.git" else branch=$(gh pr view $pr_number --repo $repo --json headRefName --jq '.headRefName') + repo_url=$(gh pr view $pr_number --repo $repo --json headRepository --jq '.headRepository.url') fi echo "::set-output name=branch::$branch" + echo "::set-output name=repo::$repo_url" checkout: needs: fetch-branch @@ -64,6 +97,7 @@ jobs: with: path: ${{ github.run_id }}/HOMEgfs submodules: 'recursive' + repository: ${{ needs.fetch-branch.outputs.repo }} ref: ${{ needs.fetch-branch.outputs.branch }} build-link: From d95630a56bf8b1ac430b33f687259cf44cc63b76 Mon Sep 17 00:00:00 2001 From: Eric Sinsky - NOAA <48259628+EricSinsky-NOAA@users.noreply.github.com> Date: Fri, 1 Nov 2024 02:13:02 -0400 Subject: [PATCH 04/10] Add more ocean variables for post-processing in GEFS (#2995) This PR adds an ocean variable `tob` (Sea Water Potential Temperature at Sea Floor) for post-processing in GEFS, which is a variable that has been requested for GEFSv13 and the reforecast. Also, this PR moves the atmos variable `PEVPR` from the "b" group to the "a" group of pgrb products in GEFS. This was requested by a reforecast stakeholder. Resolves #2993 --- parm/post/oceanice_products_gefs.yaml | 2 +- parm/product/gefs.0p25.fFFF.paramlist.a.txt | 1 + parm/product/gefs.0p25.fFFF.paramlist.b.txt | 1 - sorc/gfs_utils.fd | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parm/post/oceanice_products_gefs.yaml b/parm/post/oceanice_products_gefs.yaml index fea88df2bb..f961fab83f 100644 --- a/parm/post/oceanice_products_gefs.yaml +++ b/parm/post/oceanice_products_gefs.yaml @@ -33,7 +33,7 @@ ocean: {% elif model_grid == 'mx500' %} ocean_levels: [5, 15, 25, 35, 45, 55, 65, 75, 85, 95, 105, 115, 125, 135, 145, 155, 165, 175, 185, 195, 205, 215, 226, 241, 267] {% endif %} - subset: ['SSH', 'SST', 'SSS', 'speed', 'MLD_003', 'latent', 'sensible', 'SW', 'LW', 'LwLatSens', 'Heat_PmE', 'SSU', 'SSV', 'taux', 'tauy', 'temp', 'so', 'uo', 'vo'] + subset: ['SSH', 'SST', 'SSS', 'speed', 'MLD_003', 'latent', 'sensible', 'SW', 'LW', 'LwLatSens', 'Heat_PmE', 'SSU', 'SSV', 'taux', 'tauy', 'temp', 'tob', 'so', 'uo', 'vo'] data_in: copy: - ["{{ COM_OCEAN_HISTORY }}/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.{{ interval }}hr_avg.f{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/ocean.nc"] diff --git a/parm/product/gefs.0p25.fFFF.paramlist.a.txt b/parm/product/gefs.0p25.fFFF.paramlist.a.txt index 303752ac17..4bb87c32ff 100644 --- a/parm/product/gefs.0p25.fFFF.paramlist.a.txt +++ b/parm/product/gefs.0p25.fFFF.paramlist.a.txt @@ -19,6 +19,7 @@ :CIN:180-0 mb above ground: :CIN:surface: :HLCY:3000-0 m above ground: +:PEVPR:surface: :TCDC:entire atmosphere (considered as a single layer): :WEASD:surface: :SNOD:surface: diff --git a/parm/product/gefs.0p25.fFFF.paramlist.b.txt b/parm/product/gefs.0p25.fFFF.paramlist.b.txt index ccad9da4d0..5c406ce34d 100644 --- a/parm/product/gefs.0p25.fFFF.paramlist.b.txt +++ b/parm/product/gefs.0p25.fFFF.paramlist.b.txt @@ -151,7 +151,6 @@ :O3MR:5 mb: :O3MR:70 mb: :O3MR:7 mb: -:PEVPR:surface: :PLI:30-0 mb above ground: :PLPL:255-0 mb above ground: :POT:0.995 sigma level: diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd index a00cc0949e..856a42076a 160000 --- a/sorc/gfs_utils.fd +++ b/sorc/gfs_utils.fd @@ -1 +1 @@ -Subproject commit a00cc0949e2f901e73b58d54834517743916c69a +Subproject commit 856a42076a65256aaae9b29f4891532cb4a3fbca From 5e867df8aaffb95f7895fa741db33e9d12c6a4dc Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Fri, 1 Nov 2024 18:05:43 +0000 Subject: [PATCH 05/10] GitHub CI Pipeline update for debugging forked PR support (#3056) # Description Updating GitHub CI pipeline's bug with passing repo variables for `actions/checkout@v4` to support forked PRs. Had to debug directly from develop in authoritative repo because did not not have fork of fork for the development tests. # Type of change - [x] Bug fix (fixes something broken) - [ ] New feature (adds functionality) - [ ] Maintenance (code refactor, clean-up, new CI test, etc.) --------- Co-authored-by: Terry McGuinness --- .github/workflows/pw_aws_ci.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index c59f027920..f97825c5bc 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -80,8 +80,10 @@ jobs: branch=$(gh pr view $pr_number --repo $repo --json headRefName --jq '.headRefName') repo_url=$(gh pr view $pr_number --repo $repo --json headRepository --jq '.headRepository.url') fi - echo "::set-output name=branch::$branch" - echo "::set-output name=repo::$repo_url" + { + echo "BRANCH=$branch" + echo "REPO=$repo_url" + } >> $GITHUB_OUTPUT checkout: needs: fetch-branch @@ -97,8 +99,8 @@ jobs: with: path: ${{ github.run_id }}/HOMEgfs submodules: 'recursive' - repository: ${{ needs.fetch-branch.outputs.repo }} - ref: ${{ needs.fetch-branch.outputs.branch }} + repository: ${{ steps.git-branch.outputs.BRANCH }} + ref: ${{ steps.git-branch.outputs.REPO }} build-link: needs: checkout From 19eca3f2aae6116a45f6449ab52877e2eec0f011 Mon Sep 17 00:00:00 2001 From: Kate Friedman Date: Fri, 1 Nov 2024 14:29:08 -0400 Subject: [PATCH 06/10] Revert "GitHub CI Pipeline update for debugging forked PR support" (#3057) Reverts NOAA-EMC/global-workflow#3056 @TerrenceMcGuinness-NOAA will open a new PR for these changes to be reviewed and approved. --- .github/workflows/pw_aws_ci.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index f97825c5bc..c59f027920 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -80,10 +80,8 @@ jobs: branch=$(gh pr view $pr_number --repo $repo --json headRefName --jq '.headRefName') repo_url=$(gh pr view $pr_number --repo $repo --json headRepository --jq '.headRepository.url') fi - { - echo "BRANCH=$branch" - echo "REPO=$repo_url" - } >> $GITHUB_OUTPUT + echo "::set-output name=branch::$branch" + echo "::set-output name=repo::$repo_url" checkout: needs: fetch-branch @@ -99,8 +97,8 @@ jobs: with: path: ${{ github.run_id }}/HOMEgfs submodules: 'recursive' - repository: ${{ steps.git-branch.outputs.BRANCH }} - ref: ${{ steps.git-branch.outputs.REPO }} + repository: ${{ needs.fetch-branch.outputs.repo }} + ref: ${{ needs.fetch-branch.outputs.branch }} build-link: needs: checkout From 5bde6495b9212ef6c3d4afd26999f3cb844756ad Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Fri, 1 Nov 2024 20:25:33 +0000 Subject: [PATCH 07/10] PW CI pipeline update5 ready for review so it can be merged and tested (#3059) # Discription Latest updates to CI GitHub Pipeline: - Explicitly gets owner of the repo from PRs when coming in from forked repos (was deficient on last iteration) - Updated to more current method to GITHUB_OUTPUT for inter job variable passing # Type of change - [x] Bug fix (fixes something broken) - [ ] New feature (adds functionality) - [ ] Maintenance (code refactor, clean-up, new CI test, etc.) NOTE: Many updates where used in the PR process as the pipeline development had to occur directly in the authoritative repo on the develop branch for testing `actions/checkout@v4` when cloning from a forked repo. # How is this tested Once the update is made in the default develop branch the action can be tested. We can not test this from a forked repo because said test would require a fork of a fork. --------- Co-authored-by: Terry McGuinness --- .github/workflows/pw_aws_ci.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index c59f027920..ffee433425 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -78,10 +78,14 @@ jobs: repo_url="https://github.com/${{ github.repository_owner }}/${{ github.repository }}.git" else branch=$(gh pr view $pr_number --repo $repo --json headRefName --jq '.headRefName') - repo_url=$(gh pr view $pr_number --repo $repo --json headRepository --jq '.headRepository.url') + repo_owner=$(gh pr view $pr_number --repo $repo --json headRepositoryOwner --jq '.headRepositoryOwner.login') + repo_name=$(gh pr view $pr_number --repo $repo --json headRepository --jq '.headRepository.name') + repo_url="https://github.com/$repo_owner/$repo_name.git" fi - echo "::set-output name=branch::$branch" - echo "::set-output name=repo::$repo_url" + { + echo "branch=$branch" + echo "repo=$repo_url" + } >> $GITHUB_OUTPUT checkout: needs: fetch-branch From 75c3c672597f8eda4d1873daf54ee95c5d1a2f7d Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Fri, 1 Nov 2024 21:00:16 +0000 Subject: [PATCH 08/10] Update workflow pipeline (#3060) Change repo_url to repo owner/branch format for actions/checkout@v4 as part of in place pipeline development within. --- .github/workflows/pw_aws_ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index ffee433425..c28f9abbf0 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -75,12 +75,12 @@ jobs: repo=${{ github.repository }} if [ "$pr_number" -eq "0" ]; then branch=${{ github.event.inputs.ref }} - repo_url="https://github.com/${{ github.repository_owner }}/${{ github.repository }}.git" + repo="{{ github.repository_owner }}/${{ github.repository }}" else branch=$(gh pr view $pr_number --repo $repo --json headRefName --jq '.headRefName') repo_owner=$(gh pr view $pr_number --repo $repo --json headRepositoryOwner --jq '.headRepositoryOwner.login') repo_name=$(gh pr view $pr_number --repo $repo --json headRepository --jq '.headRepository.name') - repo_url="https://github.com/$repo_owner/$repo_name.git" + repo="$repo_owner/$repo_name" fi { echo "branch=$branch" From c667ffaa0736c7b3b6abbccbaffe9c63a26e67c0 Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Fri, 1 Nov 2024 21:38:43 +0000 Subject: [PATCH 09/10] Update to action workflow pipeline in default repo for development (#3061) # Description change **repo_url** to **repo** in order to pass the correct value to `actions/checkout@v4` as part of in place pipeline development with in authoritative repo ergo no review necessary # Type of change - [x] Bug fix (fixes something broken) - [ ] New feature (adds functionality) - [ ] Maintenance (code refactor, clean-up, new CI test, etc.) Co-authored-by: Terry McGuinness --- .github/workflows/pw_aws_ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index c28f9abbf0..9d4a6f3c37 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -84,7 +84,7 @@ jobs: fi { echo "branch=$branch" - echo "repo=$repo_url" + echo "repo=$repo" } >> $GITHUB_OUTPUT checkout: From 152bb45041ff7b69d14db98648b351a8f527e8d5 Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Fri, 1 Nov 2024 23:19:08 +0000 Subject: [PATCH 10/10] Update to action workflow pipeline in default repo for development (#3062) # Description Still did not have the repo value correct for when PR=0 and branch is selected from the actions menu. This is part of in place pipeline development with in authoritative repo. (_ergo no review necessary_) # Type of change - [x] Bug fix (fixes something broken) - [ ] New feature (adds functionality) - [ ] Maintenance (code refactor, clean-up, new CI test, etc.) --------- Co-authored-by: Terry McGuinness --- .github/workflows/pw_aws_ci.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pw_aws_ci.yaml b/.github/workflows/pw_aws_ci.yaml index 9d4a6f3c37..f398ca4baf 100644 --- a/.github/workflows/pw_aws_ci.yaml +++ b/.github/workflows/pw_aws_ci.yaml @@ -15,7 +15,7 @@ on: workflow_dispatch: inputs: pr_number: - description: 'Pull Request Number (use 0 for non-PR)' + description: 'PR Number (use 0 for non-PR)' required: true default: '0' os: @@ -72,10 +72,9 @@ jobs: id: get-branch run: | pr_number=${{ github.event.inputs.pr_number }} - repo=${{ github.repository }} if [ "$pr_number" -eq "0" ]; then branch=${{ github.event.inputs.ref }} - repo="{{ github.repository_owner }}/${{ github.repository }}" + repo=${{ github.repository }} else branch=$(gh pr view $pr_number --repo $repo --json headRefName --jq '.headRefName') repo_owner=$(gh pr view $pr_number --repo $repo --json headRepositoryOwner --jq '.headRepositoryOwner.login')