From 20562031cda81fbd20aad4f542b2af903d4adaa6 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Fri, 17 Sep 2021 16:51:38 +0200
Subject: fix ci: suggest vcpkg_*_cmake -> vcpkg_cmake_* migration (#20218)

---
 .github/workflows/untrustedPR.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml
index 895cd999e..22ba597dd 100644
--- a/.github/workflows/untrustedPR.yml
+++ b/.github/workflows/untrustedPR.yml
@@ -38,8 +38,7 @@ jobs:
           git config user.email github-actions
           git config user.name github-actions@github.com
 
-          # HEAD^^ refers to the second parent of the merge commit
-          git diff --name-status --merge-base HEAD^^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -s '(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\`"; done > .github-pr.deprecated-cmake
           ./vcpkg format-manifest --all --convert-control
           git diff > .github-pr.format-manifest
           git add -u
-- 
cgit v1.2.3