Revert "github: debug windows protoc failure"

This reverts commit 85b2069.
alsed · Jun 15, 2024 · fea571f · fea571f
1 parent 6561b16
commit fea571f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -9,7 +9,7 @@ on: [push, workflow_dispatch]
 jobs:
   job:
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         include:
           - os: windows
@@ -65,39 +65,13 @@ jobs:
         id: linux-deps
         run: sudo apt-get install libsdl1.2-dev libcereal-dev libphysfs-dev libboost-dev libpng-dev libjsoncpp-dev libogg-dev libvorbis-dev libtheora-dev libprotobuf-dev protobuf-compiler
 
-      - name: Run CMake configure
+      - name: Run CMake and CPack
         uses: lukka/run-cmake@v10
-        id: runcmake-config
+        id: runcmake
         with:
           cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
           configurePreset: ${{ matrix.preset }}
-          configurePresetAdditionalArgs: "['-DPROTOBUF_DEBUG=YES']"
           buildPreset: ${{ matrix.preset }}
-          buildPresetAdditionalArgs: "['--parallel', '--target', 'dummy']"
-
-      - name: List protobuf buildtree
-        if: ${{ contains(matrix.preset, 'windows') }}
-        shell: bash
-        run: find vcpkg/buildtrees/protobuf
-
-      - name: Save protobuf buildtree
-        uses: actions/upload-artifact@v4
-        if: ${{ contains(matrix.preset, 'windows') }}
-        with:
-          name: windows-buildtree-protobuf
-          overwrite: true
-          if-no-files-found: error
-          path: |
-            vcpkg/buildtrees/protobuf/*.log
-            vcpkg/buildtrees/protobuf/*.txt
-
-      - name: Run CMake build
-        uses: lukka/run-cmake@v10
-        id: runcmake-build
-        with:
-          cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-          buildPreset: ${{ matrix.preset }}
-          buildPresetAdditionalArgs: "['--parallel']"
           packagePreset: ${{ matrix.package }}
 
       - name: List $RUNNER_WORKSPACE after build
@@ -133,4 +107,4 @@ jobs:
           overwrite: true
           if-no-files-found: error
           compression-level: 0
-          path: ${{ steps.readpkg.outputs.package_file_name }}
+          path: ${{ steps.readpkg.outputs.package_file_name }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,4 +101,3 @@ endif("${lc_CMAKE_BUILD_TYPE}" STREQUAL "debug")
 add_custom_target(tag
 	COMMAND ${GIT} tag -a v${raceintospace_VERSION_FULL})
 
-add_custom_target(dummy COMMAND echo dummy)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -101,4 +101,3 @@ endif("${lc_CMAKE_BUILD_TYPE}" STREQUAL "debug")
		add_custom_target(tag
		COMMAND ${GIT} tag -a v${raceintospace_VERSION_FULL})

		add_custom_target(dummy COMMAND echo dummy)