From 2f8e89badf4b4b928174aeea687431a9ebc87311 Mon Sep 17 00:00:00 2001 From: Thierry Moisan Date: Mon, 30 Dec 2024 11:51:23 -0500 Subject: [PATCH 1/3] workflows: use `brew deps` to detect if subversion is required --- .github/workflows/scheduled.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 18043a2d55811..9d545fbde5449 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -124,10 +124,10 @@ jobs: brew install curl echo "HOMEBREW_FORCE_BREWED_CURL=1" >>"${GITHUB_ENV}" - - name: Install and use Homebrew svn if needed + - name: Install Homebrew subversion if needed for downloading sources run: | - if brew ruby -e 'exit 1 if Formula[ARGV.first].deps.none? { |d| d.name == "subversion" && d.implicit? }' "$FORMULA"; then - brew install svn + if brew deps --include-implicit -1 $FORMULA | grep -q subversion; then + brew install subversion fi - name: Check formula source is not archived. From f4594497c031582c77ac4b77e8a439a7d9bfe54d Mon Sep 17 00:00:00 2001 From: Thierry Moisan Date: Mon, 30 Dec 2024 22:48:59 -0500 Subject: [PATCH 2/3] Update .github/workflows/scheduled.yml Co-authored-by: Ruoyu Zhong --- .github/workflows/scheduled.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 9d545fbde5449..88dbe96099b3c 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -126,7 +126,7 @@ jobs: - name: Install Homebrew subversion if needed for downloading sources run: | - if brew deps --include-implicit -1 $FORMULA | grep -q subversion; then + if brew deps --include-implicit --direct "$FORMULA" | grep -Fqx subversion; then brew install subversion fi From 95c583f2b941848928902a1e4c84232d4d86bbfa Mon Sep 17 00:00:00 2001 From: Thierry Moisan Date: Tue, 31 Dec 2024 16:10:08 -0500 Subject: [PATCH 3/3] fixup! Update .github/workflows/scheduled.yml --- .github/workflows/scheduled.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 88dbe96099b3c..437e8e9c53071 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -126,7 +126,7 @@ jobs: - name: Install Homebrew subversion if needed for downloading sources run: | - if brew deps --include-implicit --direct "$FORMULA" | grep -Fqx subversion; then + if comm -23 <(brew deps --include-implicit --direct "$FORMULA" | sort) <(brew deps --direct "$FORMULA" | sort) | grep -Fqx subversion; then brew install subversion fi