aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorautoantwort <41973254+autoantwort@users.noreply.github.com>2021-09-20 17:57:30 +0200
committerGitHub <noreply@github.com>2021-09-20 08:57:30 -0700
commit28f361cfa9298e88ae31ea9439ccb5b87bb0fcd9 (patch)
treecb16d27b3c2b7855e6bf1b4908601b7ef1696101 /.github/workflows
parent515b002d286d0aad352c15270588901fc47ddab8 (diff)
downloadvcpkg-28f361cfa9298e88ae31ea9439ccb5b87bb0fcd9.tar.gz
vcpkg-28f361cfa9298e88ae31ea9439ccb5b87bb0fcd9.zip
vcpkg ci: grep returns -1 when it finds nothing, use || true so that the term returns 0 (#20236)
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/untrustedPR.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml
index 22ba597dd..cb77b745f 100644
--- a/.github/workflows/untrustedPR.yml
+++ b/.github/workflows/untrustedPR.yml
@@ -38,7 +38,7 @@ jobs:
git config user.email github-actions
git config user.name github-actions@github.com
- git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`"; done > .github-pr.deprecated-cmake
+ git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake
./vcpkg format-manifest --all --convert-control
git diff > .github-pr.format-manifest
git add -u