From 1d23fc1089eeb1fd68bde722a89ef5d578d6d544 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 6 May 2024 09:39:09 -0400 Subject: [PATCH 1/2] fix: Include script requirements in upgrade. The `upgrade-one-python-dependency` workflow would fail if there were changes in the scripts directory because they wouldn't get added to the PR. Update the list of `add-paths` for the workflow so that it doesn't fail like this in the future. --- .github/workflows/upgrade-one-python-dependency.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index dbc7eb9448..40ede77581 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -86,7 +86,9 @@ jobs: with: branch: "${{ github.triggering_actor }}/upgrade-${{ inputs.package }}" branch-suffix: short-commit-hash - add-paths: requirements + add-paths: | + requirements + scripts/**/requirements commit-message: | feat: Upgrade Python dependency ${{ inputs.package }} From b9623833c8756c9c07536193647f73ac38c4ba84 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 6 May 2024 09:50:12 -0400 Subject: [PATCH 2/2] fix: Ensure depedency checks run on script requirements as well. --- .github/workflows/check-consistent-dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index b2466b8830..51a4d5f24f 100644 --- a/.github/workflows/check-consistent-dependencies.yml +++ b/.github/workflows/check-consistent-dependencies.yml @@ -28,7 +28,7 @@ jobs: echo $'Paths touched in PR:\n'"$paths" # The ^"? is because git may quote weird file paths - matched="$(echo "$paths" | grep -P '^"?requirements/' || true)" + matched="$(echo "$paths" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))' || true)" echo $'Relevant paths:\n'"$matched" if [[ -n "$matched" ]]; then echo "RELEVANT=true" >> "$GITHUB_ENV"