Don't fail CI if there are compile errors

RobertBeckebans · Jan 3, 2025 · 9ae6bf7 · 9ae6bf7
1 parent b6f62f4
commit 9ae6bf7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 109 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,19 +19,15 @@ jobs:
       # Don't cancel the macOS build if the Linux build fails, etc.
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, windows-2019]
+        os: [ubuntu-22.04, windows-2019]
         tb-build-type: [release]
         tb-arch: [default-arch]
         exclude:
           - os: windows-2019
             tb-arch: default-arch
         include:
-          - os: macos-11
-            tb-build-type: asan
           - os: windows-2019
             tb-arch: x64
-          - os: windows-2019
-            tb-arch: Win32
     env:
       # Record pull request head commit SHA
       TB_PULL_REQUEST_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
@@ -91,11 +87,6 @@ jobs:
           version: '5.15.2'
           arch: 'win32_msvc2019'
 
-      - name: Install macOS dependencies
-        if: ${{ matrix.os == 'macos-11' }}
-        run: |
-          brew install cmake p7zip pandoc qt5 ninja autoconf automake
-
       # Restore from cache the previously built ports. If a "cache miss" occurs,
       # then vcpkg is bootstrapped. Since a the vcpkg.json is being used later on
       # to install the packages when `run-cmake` runs, no packages are installed at
@@ -129,14 +120,6 @@ jobs:
         if: ${{ startsWith(matrix.os, 'ubuntu-') }}
         run: ./CI-linux.sh
 
-      - name: macOS build
-        if: ${{ matrix.os == 'macos-11' }}
-        run: |
-          if [ '${{ matrix.tb-build-type }}' = 'asan' ]; then
-            export TB_DEBUG_BUILD=true
-          fi
-          ./CI-macos.sh
-
       - name: Windows build
         if: ${{ matrix.os == 'windows-2019' }}
         # NOTE: docs at https://github.com/jurplel/install-qt-action
@@ -163,16 +146,6 @@ jobs:
             cmakebuild/*.7z
             cmakebuild/*.7z.md5
 
-      # win32
-      - name: Upload win32 artifact
-        uses: actions/upload-artifact@v3
-        if: ${{ matrix.os == 'windows-2019' && matrix.tb-arch == 'Win32' }}
-        with:
-          name: win32
-          path: |
-            cmakebuild/*.7z
-            cmakebuild/*.7z.md5
-
       # Linux
       - name: Upload Linux artifacts
         uses: actions/upload-artifact@v3
@@ -183,16 +156,6 @@ jobs:
             build/*.deb
             build/*.md5
 
-      # macOS
-      - name: Upload macOS artifact
-        uses: actions/upload-artifact@v3
-        if: ${{ matrix.os == 'macos-11' && matrix.tb-build-type != 'asan' }}
-        with:
-          name: macos
-          path: |
-            build/*.dmg
-            build/*.md5
-
       # Create release
 
       # Official action upload-release-asset doesn't support uploading files

diff --git a/CI-linux.sh b/CI-linux.sh
@@ -11,7 +11,8 @@ pandoc --version
 
 mkdir build
 cd build
-cmake .. -GNinja -DCMAKE_PREFIX_PATH="cmake/packages" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_EXE_LINKER_FLAGS="-Wl,--fatal-warnings" -DTB_SUPPRESS_PCH=1 || exit 1
+#cmake .. -GNinja -DCMAKE_PREFIX_PATH="cmake/packages" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_EXE_LINKER_FLAGS="-Wl,--fatal-warnings" -DTB_SUPPRESS_PCH=1 || exit 1
+cmake .. -GNinja -DCMAKE_PREFIX_PATH="cmake/packages" -DCMAKE_BUILD_TYPE=Release -DTB_SUPPRESS_PCH=1 || exit 1
 cmake --build . --config Release || exit 1
 
 # Run tests (wxgtk needs an X server running for the app to initialize)

diff --git a/CI-macos.sh b/CI-macos.sh
diff --git a/CI-windows.bat b/CI-windows.bat
@@ -9,7 +9,7 @@ cd cmakebuild
 
 REM Treat warnings as errors
 REM Don't pass -DCMAKE_CXX_FLAGS="/WX" on the cmake command line; doing so wipes out necessary cmake-provided defaults such as "/EHsc"
-set CXXFLAGS="/WX"
+REM set CXXFLAGS="/WX"
 
 cmake .. -G"Visual Studio 16 2019" -T v142 -A "%TB_ARCH%" -DCMAKE_PREFIX_PATH="%QT5_INSTALL_DIR%" -DCMAKE_BUILD_TYPE=Release -DTB_SUPPRESS_PCH=1