workflows removed workaround (FetchContent)

Removed workaround for FetchContent UPDATE_DISCONNECTED bug. Bug was fixed in CMake v3.30.2. See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
silverqx · Aug 12, 2024 · 6d8556b · 6d8556b
1 parent d2e1959
commit 6d8556b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 52 deletions.
diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml
@@ -492,17 +492,6 @@ jobs:
       run: |
         ccache --zero-stats
 
-    # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
-    # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
-    - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ runner.workspace }}
-      run: >-
-        rm --force --recursive
-        ./HelloWorld-builds-cmake/build-TinyDrivers-fetchcontent-gcc-${{ matrix.build-type.key }}
-
-        rm --force --recursive
-        ./HelloWorld-TinyDrivers-FetchContent-Install/${{ matrix.build-type.name }}
-
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=OFF is correct (I want to use PCH here)
     - name: HelloWorld-TinyDrivers cmake configure (${{ env.HelloWorldFetchContentBuildName }})
       working-directory: HelloWorld-TinyDrivers

diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml
@@ -444,17 +444,6 @@ jobs:
       run: |
         ccache --zero-stats
 
-    # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
-    # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
-    - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ runner.workspace }}
-      run: >-
-        rm --force --recursive
-        ./HelloWorld-builds-cmake/build-fetchcontent-gcc-${{ matrix.build-type.key }}
-
-        rm --force --recursive
-        ./HelloWorld-FetchContent-Install/${{ matrix.build-type.name }}
-
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=OFF is correct (I want to use PCH here)
     - name: HelloWorld cmake configure (${{ env.HelloWorldFetchContentBuildName }})
       working-directory: HelloWorld

diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml
@@ -510,21 +510,6 @@ jobs:
       run: |
         ccache.exe --zero-stats
 
-    # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
-    # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
-    - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ runner.workspace }}
-      run: |
-        if (Test-Path ./HelloWorld-builds-cmake/Drivers-fetchcontent-msvc-${{ matrix.build-type.key }}) {
-          Remove-Item -Force -Recurse -Path `
-          ./HelloWorld-builds-cmake/Drivers-fetchcontent-msvc-${{ matrix.build-type.key }}
-        }
-
-        if (Test-Path ./HelloWorld-TinyDrivers-FetchContent-Install/${{ matrix.build-type.name }}) {
-          Remove-Item -Force -Recurse -Path `
-          ./HelloWorld-TinyDrivers-FetchContent-Install/${{ matrix.build-type.name }}
-        }
-
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=ON is correct (Windows ccache doesn't work well with PCH)
     - name: HelloWorld-TinyDrivers cmake configure (${{ env.HelloWorldFetchContentBuildName }})
       working-directory: HelloWorld-TinyDrivers

diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml
@@ -453,21 +453,6 @@ jobs:
       run: |
         ccache.exe --zero-stats
 
-    # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
-    # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
-    - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ runner.workspace }}
-      run: |
-        if (Test-Path ./HelloWorld-builds-cmake/build-fetchcontent-msvc-${{ matrix.build-type.key }}) {
-          Remove-Item -Force -Recurse -Path `
-          ./HelloWorld-builds-cmake/build-fetchcontent-msvc-${{ matrix.build-type.key }}
-        }
-
-        if (Test-Path ./HelloWorld-FetchContent-Install/${{ matrix.build-type.name }}) {
-          Remove-Item -Force -Recurse -Path `
-          ./HelloWorld-FetchContent-Install/${{ matrix.build-type.name }}
-        }
-
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=ON is correct (Windows ccache doesn't work well with PCH)
     - name: HelloWorld cmake configure (${{ env.HelloWorldFetchContentBuildName }})
       working-directory: HelloWorld