Revert changes to allow conflicts to be fixed

Author: mcbarton

.github/workflows/ci.yml

@@ -53,15 +53,6 @@ jobs:
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-x86-gcc12-clang16-cling
-            os: ubuntu-22.04
-            compiler: gcc-12
-            clang-runtime: '16'
-            cling: On
-            cling-version: '1.1'
-            cppyy: On
-            llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host;NVPTX"
           - name: ubu22-x86-gcc9-clang13-cling
             os: ubuntu-22.04
             compiler: gcc-9
@@ -127,15 +118,6 @@ jobs:
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: osx15-arm-clang-clang16-cling
-            os: macos-15
-            compiler: clang
-            clang-runtime: '16'
-            cling: On
-            cling-version: '1.1'
-            cppyy: On
-            llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host;NVPTX"
           - name: osx15-arm-clang-clang13-cling
             os: macos-15
             compiler: clang
@@ -177,15 +159,6 @@ jobs:
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: osx13-x86-clang-clang16-cling
-            os: macos-13
-            compiler: clang
-            clang-runtime: '16'
-            cling: On
-            cling-version: '1.1'
-            cppyy: On
-            llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host;NVPTX"
           - name: osx13-x86-clang-clang13-cling
             os: macos-13
             compiler: clang
@@ -412,13 +385,6 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling 
           git checkout tags/v${{ matrix.cling-version }}
-          # Apply patches
-          llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
-          if [[ "${llvm_vers}" == "16" ]]; then
-            # cling version 1.1 with llvm 16 requires a patch to fix error handling when parsing invaild code
-            git apply -v ../patches/llvm/cling${{ matrix.clang-runtime }}-*.patch
-            echo "Apply cling${{ matrix.clang-runtime }}-*.patch patches:"
-          fi
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
         else # repl
@@ -445,10 +411,8 @@ jobs:
                 ../llvm
           cmake --build . --target clang --parallel ${{ env.ncpus }}
           cmake --build . --target cling --parallel ${{ env.ncpus }}
-          if [[ "${{ matrix.clang-runtime}}" == "13" ]]; then
-            # Now build gtest.a and gtest_main for CppInterOp to run its tests.
-            cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
-          fi
+          # Now build gtest.a and gtest_main for CppInterOp to run its tests.
+          cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
         else
           # Apply patches
           llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -488,11 +452,6 @@ jobs:
           git clone https://github.com/root-project/cling.git
           cd ./cling 
           git checkout tags/v${{ matrix.cling-version }}
-          if ( "${{ matrix.clang-runtime }}" -imatch "16" )
-          {
-            # cling version 1.1 with llvm 16 requires a patch to fix error handling when parsing invaild code
-            git apply -v clang16-1-Error-Handling.patch
-          }
           cd ..
           git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
           $env:PWD_DIR= $PWD.Path
@@ -526,12 +485,8 @@ jobs:
                 ..\llvm
           cmake --build . --config Release --target clang --parallel ${{ env.ncpus }}
           cmake --build . --config Release --target cling --parallel ${{ env.ncpus }}
-          if ( "${{ matrix.clang-runtime }}" -imatch "13" )
-          {
-            # cling version 1.0 with llvm 13 doesn't work on Windows, but this is here in
-            # case someone finds a way to fix this
-            cmake --build . --config Release --target gtest_main --parallel ${{ env.ncpus }}
-          }
+          # Now build gtest.a and gtest_main for CppInterOp to run its tests.
+          cmake --build . --config Release --target gtest_main --parallel ${{ env.ncpus }}
         }
         else
         {
@@ -616,13 +571,6 @@ jobs:
             clang-runtime: '16'
             cling: Off
             cppyy: Off
-          - name: ubu22-x86-gcc12-clang16-cling
-            os: ubuntu-22.04
-            compiler: gcc-12
-            clang-runtime: '16'
-            cling: On
-            cling-version: '1.1'
-            cppyy: Off
           - name: ubu22-x86-gcc9-clang13-cling-cppyy
             os: ubuntu-22.04
             compiler: gcc-9
@@ -680,13 +628,6 @@ jobs:
             clang-runtime: '16'
             cling: Off
             cppyy: Off
-          - name: osx15-arm-clang-clang16-cling-cppyy
-            os: macos-15
-            compiler: clang
-            clang-runtime: '16'
-            cling: On
-            cling-version: '1.1'
-            cppyy: Off
           - name: osx15-arm-clang-clang13-cling-cppyy
             os: macos-15
             compiler: clang
@@ -718,20 +659,13 @@ jobs:
             clang-runtime: '16'
             cling: Off
             cppyy: Off
-          - name: osx13-x86-clang-clang16-cling
-            os: macos-13
-            compiler: clang
-            clang-runtime: '16'
-            cling: On
-            cling-version: '1.1'
-            cppyy: Off
           - name: osx13-x86-clang-clang13-cling-cppyy
             os: macos-13
             compiler: clang
             clang-runtime: '13'
             cling: On
             cling-version: '1.0'
-            cppyy: Off
+            cppyy: On
 
     steps:
     - uses: actions/checkout@v4