diff --git a/.github/workflows/checkCI.yml b/.github/workflows/checkCI.yml
index 415896cefa..ac2d61b18b 100644
--- a/.github/workflows/checkCI.yml
+++ b/.github/workflows/checkCI.yml
@@ -51,7 +51,6 @@ jobs:
           - macos-clang
           - windows-msvc
           - windows-mingw
-          - windows-cygwin
         configuration:
           - Debug
         include:
@@ -67,9 +66,6 @@ jobs:
           - toolchain: windows-mingw
             os: windows-latest
             compiler: mingw
-          - toolchain: windows-cygwin
-            os: windows-latest
-            compiler: cygwin
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -83,9 +79,6 @@ jobs:
           elif [ "${{ matrix.compiler }}" == "mingw" ]; then
             cmake -S "$SRCDIR" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$TESTDIR" -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -G "MinGW Makefiles"
             cmake --build build
-          elif [ "${{ matrix.compiler }}" == "cygwin" ]; then
-            cmake -S "$SRCDIR" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$TESTDIR" -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -G "Unix Makefiles"
-            cmake --build build
           else
             cmake -S "$SRCDIR" -B build -DMODELICA_UTILITIES_INCLUDE_DIR="$TESTDIR" -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }}
             cmake --build build
@@ -96,13 +89,30 @@ jobs:
       - name: Run tests
         run: ctest --test-dir build --build-config ${{ matrix.configuration }} --verbose --output-junit junit-${{ matrix.compiler }}.xml
       - name: Upload test report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always() # always run even if the previous step fails
         with:
           name: junit-test-results
           path: '**/build/junit-*.xml'
           retention-days: 1
 
+  report:
+    needs: external_c_checks_cmake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download test report
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          name: junit-test-results
+          workflow: ${{ github.event.workflow.id }}
+          run_id: ${{ github.event.workflow_run.id }}
+      - name: Publish test teport
+        uses: mikepenz/action-junit-report@v3
+        with:
+          commit: ${{github.event.workflow_run.head_sha}}
+          report_paths: '**/build/junit-*.xml'
+          annotate_only: true
+
   html_documentation_checks:
     name: html-documentation-checks
     timeout-minutes: 5
diff --git a/.github/workflows/reportCI.yml b/.github/workflows/reportCI.yml
deleted file mode 100644
index 6ceaa72d4b..0000000000
--- a/.github/workflows/reportCI.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: CI report
-
-on:
-  workflow_run:
-    workflows: [CI]
-    types: [completed]
-
-permissions:
-  checks: write
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download test report
-        uses: dawidd6/action-download-artifact@v3
-        with:
-          name: junit-test-results
-          workflow: ${{ github.event.workflow.id }}
-          run_id: ${{ github.event.workflow_run.id }}
-      - name: Publish test teport
-        uses: mikepenz/action-junit-report@v3
-        with:
-          commit: ${{github.event.workflow_run.head_sha}}
-          report_paths: '**/build/junit-*.xml'
-          annotate_only: true