Skip to content

Commit c31779e

Browse files
CarterLiCarterLi
committed
CI: ensures CMAKE_BUILD_TYPE is correctly set
1 parent 89ad35d commit c31779e

6 files changed

Lines changed: 10 additions & 41 deletions

File tree

‎.github/workflows/build-dragonfly-amd64.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable DragonFly amd64
33
on:
44
workflow_call:
55

6-
env:
7-
CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -19,8 +16,6 @@ jobs:
1916

2017
- name: Start VM
2118
uses: cross-platform-actions/action@master
22-
env:
23-
CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE
2419
with:
2520
operating_system: dragonflybsd
2621
version: '6.4.2'
@@ -38,7 +33,7 @@ jobs:
3833
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
3934
4035
- name: CMake configuration
41-
run: env CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
36+
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' }} .
4237

4338
- name: CMake build
4439
run: cmake --build . --target package --verbose -j4

‎.github/workflows/build-freebsd-amd64.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable FreeBSD amd64
33
on:
44
workflow_call:
55

6-
env:
7-
CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -19,8 +16,6 @@ jobs:
1916

2017
- name: Start VM
2118
uses: cross-platform-actions/action@master
22-
env:
23-
CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE
2419
with:
2520
operating_system: freebsd
2621
version: '15.1'
@@ -39,7 +34,7 @@ jobs:
3934
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
4035
4136
- name: CMake configuration
42-
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
37+
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_BUILD_TYPE=${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }} .
4338

4439
- name: CMake build
4540
run: cmake --build . --target package --verbose -j4

‎.github/workflows/build-haiku-amd64.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable Haiku amd64
33
on:
44
workflow_call:
55

6-
env:
7-
CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -19,24 +16,21 @@ jobs:
1916

2017
- name: Start VM
2118
uses: cross-platform-actions/action@master
22-
env:
23-
CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE
2419
with:
2520
operating_system: haiku
2621
version: 'r1beta5'
2722
shell: bash
2823
cpu_count: 4
2924

3025
- name: Show system info
31-
run: |
32-
uname -a
26+
run: uname -a
3327

34-
- name: Update and install dependencies
35-
run: |
36-
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
28+
- name: Install dependencies
29+
shell: cpa.sh {0} --reboot
30+
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
3731

3832
- name: CMake configuration
39-
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
33+
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' }} .
4034

4135
- name: CMake build
4236
run: cmake --build . --target package --verbose -j4

‎.github/workflows/build-netbsd-amd64.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable NetBSD amd64
33
on:
44
workflow_call:
55

6-
env:
7-
CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -19,8 +16,6 @@ jobs:
1916

2017
- name: Start VM
2118
uses: cross-platform-actions/action@master
22-
env:
23-
CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE
2419
with:
2520
operating_system: netbsd
2621
version: '10.1'
@@ -37,7 +32,7 @@ jobs:
3732
sudo pkgin -y install clang cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick libva libvdpau
3833
3934
- name: CMake configuration
40-
run: CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
35+
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' }} .
4136

4237
- name: CMake build
4338
run: cmake --build . --target package --verbose -j4

‎.github/workflows/build-omnios-amd64.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable OmniOS amd64
33
on:
44
workflow_call:
55

6-
env:
7-
CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -19,8 +16,6 @@ jobs:
1916

2017
- name: Start VM
2118
uses: cross-platform-actions/action@master
22-
env:
23-
CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE
2419
with:
2520
operating_system: omnios
2621
version: 'r151058'
@@ -37,7 +32,7 @@ jobs:
3732
sudo pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja
3833
3934
- name: CMake configuration
40-
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja .
35+
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' }} .
4136

4237
- name: CMake build
4338
run: cmake --build . --verbose -j4

‎.github/workflows/build-openbsd-amd64.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Reusable OpenBSD amd64
33
on:
44
workflow_call:
55

6-
env:
7-
CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -19,8 +16,6 @@ jobs:
1916

2017
- name: Start VM
2118
uses: cross-platform-actions/action@master
22-
env:
23-
CMAKE_BUILD_TYPE: CMAKE_BUILD_TYPE
2419
with:
2520
operating_system: openbsd
2621
version: '7.9'
@@ -37,7 +32,7 @@ jobs:
3732
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
3833
3934
- name: CMake configuration
40-
run: CC=clang-21 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
35+
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' }} .
4136

4237
- name: CMake build
4338
run: cmake --build . --target package --verbose -j4

0 commit comments

Comments
 (0)