[ci] Use clang patches in CppInterOp, not cppyy-backend

aaronj0 · web-flow · commit b184a46ea3c5 · 2024-09-24T14:08:14.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -372,7 +372,7 @@ jobs:
          # Apply patches
           llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
           if [[ "${llvm_vers}" == "16" ]]||[[ "${llvm_vers}" == "17" ]]; then
-            git apply -v ../cppyy-backend/patches/llvm/clang${{ matrix.clang-runtime }}-*.patch
+            git apply -v ../patches/llvm/clang${{ matrix.clang-runtime }}-*.patch
             echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"
           fi
           cd build
@@ -439,7 +439,7 @@ jobs:
         }
         else
         {
-          cp -r ..\cppyy-backend\patches\llvm\clang${{ matrix.clang-runtime }}*
+          cp -r ..\patches\llvm\clang${{ matrix.clang-runtime }}*
           #FIXME: Apply patches without hardcoding
           if ( "${{ matrix.clang-runtime }}" -imatch "16" )
           {

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ jobs:`
`372`	`372`	`# Apply patches`
`373`	`373`	`llvm_vers=$(echo "${{ matrix.clang-runtime }}" \| tr '[:lower:]' '[:upper:]')`
`374`	`374`	`if [[ "${llvm_vers}" == "16" ]]\|\|[[ "${llvm_vers}" == "17" ]]; then`
`375`		`- git apply -v ../cppyy-backend/patches/llvm/clang${{ matrix.clang-runtime }}-*.patch`
	`375`	`+ git apply -v ../patches/llvm/clang${{ matrix.clang-runtime }}-*.patch`
`376`	`376`	`echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"`
`377`	`377`	`fi`
`378`	`378`	`cd build`
`@@ -439,7 +439,7 @@ jobs:`
`439`	`439`	`}`
`440`	`440`	`else`
`441`	`441`	`{`
`442`		`- cp -r ..\cppyy-backend\patches\llvm\clang${{ matrix.clang-runtime }}*`
	`442`	`+ cp -r ..\patches\llvm\clang${{ matrix.clang-runtime }}*`
`443`	`443`	`#FIXME: Apply patches without hardcoding`
`444`	`444`	`if ( "${{ matrix.clang-runtime }}" -imatch "16" )`
`445`	`445`	`{`