From c31779e99d0bc5f9a0811094febf8cf714a1205b Mon Sep 17 00:00:00 2001 From: Carter Li Date: Fri, 10 Jul 2026 13:21:54 +0800 Subject: [PATCH] CI: ensures `CMAKE_BUILD_TYPE` is correctly set --- .github/workflows/build-dragonfly-amd64.yml | 7 +------ .github/workflows/build-freebsd-amd64.yml | 7 +------ .github/workflows/build-haiku-amd64.yml | 16 +++++----------- .github/workflows/build-netbsd-amd64.yml | 7 +------ .github/workflows/build-omnios-amd64.yml | 7 +------ .github/workflows/build-openbsd-amd64.yml | 7 +------ 6 files changed, 10 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build-dragonfly-amd64.yml b/.github/workflows/build-dragonfly-amd64.yml index c611159fe..a9e62fd0e 100644 --- a/.github/workflows/build-dragonfly-amd64.yml +++ b/.github/workflows/build-dragonfly-amd64.yml @@ -3,9 +3,6 @@ name: Reusable DragonFly amd64 on: workflow_call: -env: - CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} - jobs: build: runs-on: ubuntu-latest @@ -19,8 +16,6 @@ jobs: - name: Start VM uses: cross-platform-actions/action@master - env: - CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE with: operating_system: dragonflybsd version: '6.4.2' @@ -38,7 +33,7 @@ jobs: sudo pkg install -y llvm cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl egl opencl ocl-icd v4l_compat chafa libelf lua54 libva libvdpau - name: CMake configuration - run: env CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . + run: env CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} . - name: CMake build run: cmake --build . --target package --verbose -j4 diff --git a/.github/workflows/build-freebsd-amd64.yml b/.github/workflows/build-freebsd-amd64.yml index 63209f2bc..041bc4ff2 100644 --- a/.github/workflows/build-freebsd-amd64.yml +++ b/.github/workflows/build-freebsd-amd64.yml @@ -3,9 +3,6 @@ name: Reusable FreeBSD amd64 on: workflow_call: -env: - CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} - jobs: build: runs-on: ubuntu-latest @@ -19,8 +16,6 @@ jobs: - name: Start VM uses: cross-platform-actions/action@master - env: - CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE with: operating_system: freebsd version: '15.1' @@ -39,7 +34,7 @@ jobs: sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl egl opencl ocl-icd v4l_compat chafa lua54 libva libvdpau - name: CMake configuration - run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . + run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} . - name: CMake build run: cmake --build . --target package --verbose -j4 diff --git a/.github/workflows/build-haiku-amd64.yml b/.github/workflows/build-haiku-amd64.yml index d77055b9d..a50550af8 100644 --- a/.github/workflows/build-haiku-amd64.yml +++ b/.github/workflows/build-haiku-amd64.yml @@ -3,9 +3,6 @@ name: Reusable Haiku amd64 on: workflow_call: -env: - CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} - jobs: build: runs-on: ubuntu-latest @@ -19,8 +16,6 @@ jobs: - name: Start VM uses: cross-platform-actions/action@master - env: - CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE with: operating_system: haiku version: 'r1beta5' @@ -28,15 +23,14 @@ jobs: cpu_count: 4 - name: Show system info - run: | - uname -a + run: uname -a - - name: Update and install dependencies - run: | - pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10 || pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10 lua + - name: Install dependencies + shell: cpa.sh {0} --reboot + run: pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake llvm22_clang ninja pkgconfig python3.10 lua || pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake llvm22_clang ninja pkgconfig python3.10 lua - name: CMake configuration - run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . + run: CC=clang CXX=clang++ cmake -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} . - name: CMake build run: cmake --build . --target package --verbose -j4 diff --git a/.github/workflows/build-netbsd-amd64.yml b/.github/workflows/build-netbsd-amd64.yml index 384968c22..96b0ba2cc 100644 --- a/.github/workflows/build-netbsd-amd64.yml +++ b/.github/workflows/build-netbsd-amd64.yml @@ -3,9 +3,6 @@ name: Reusable NetBSD amd64 on: workflow_call: -env: - CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} - jobs: build: runs-on: ubuntu-latest @@ -19,8 +16,6 @@ jobs: - name: Start VM uses: cross-platform-actions/action@master - env: - CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE with: operating_system: netbsd version: '10.1' @@ -37,7 +32,7 @@ jobs: sudo pkgin -y install clang cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick libva libvdpau - name: CMake configuration - run: CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . + run: CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} . - name: CMake build run: cmake --build . --target package --verbose -j4 diff --git a/.github/workflows/build-omnios-amd64.yml b/.github/workflows/build-omnios-amd64.yml index e8522db2d..2fc5f6ed5 100644 --- a/.github/workflows/build-omnios-amd64.yml +++ b/.github/workflows/build-omnios-amd64.yml @@ -3,9 +3,6 @@ name: Reusable OmniOS amd64 on: workflow_call: -env: - CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} - jobs: build: runs-on: ubuntu-latest @@ -19,8 +16,6 @@ jobs: - name: Start VM uses: cross-platform-actions/action@master - env: - CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE with: operating_system: omnios version: 'r151058' @@ -37,7 +32,7 @@ jobs: sudo pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja - name: CMake configuration - run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja . + run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} . - name: CMake build run: cmake --build . --verbose -j4 diff --git a/.github/workflows/build-openbsd-amd64.yml b/.github/workflows/build-openbsd-amd64.yml index b73b1d5e8..bd400f716 100644 --- a/.github/workflows/build-openbsd-amd64.yml +++ b/.github/workflows/build-openbsd-amd64.yml @@ -3,9 +3,6 @@ name: Reusable OpenBSD amd64 on: workflow_call: -env: - CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} - jobs: build: runs-on: ubuntu-latest @@ -19,8 +16,6 @@ jobs: - name: Start VM uses: cross-platform-actions/action@master - env: - CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE with: operating_system: openbsd version: '7.9' @@ -37,7 +32,7 @@ jobs: sudo pkg_add -r llvm-21.1.8p4 cmake git wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 imagemagick chafa lua-5.4.8p0 # pkg-config is preinstalled - name: CMake configuration - run: CC=clang-21 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On . + run: CC=clang-21 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} . - name: CMake build run: cmake --build . --target package --verbose -j4