From ae6d8aca6de43ab5dfc1190255d50e2b96f26846 Mon Sep 17 00:00:00 2001 From: Hannes Winkler Date: Sun, 2 Nov 2025 22:57:40 +0100 Subject: [PATCH 1/3] CI: fix typo --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index fa505e51..d85c56c4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -110,7 +110,7 @@ jobs: - 'off' - 'on-inproc' - 'on-crashpad-bundled' - - 'on-crashped-unbundled' + - 'on-crashpad-unbundled' include: - graphics-backends: 'vulkan-only' enable-vulkan: 'on' @@ -153,7 +153,7 @@ jobs: sentry-bundled-crashpad-handler: 'on' sentry-deps: 'libcurl4-openssl-dev' - - senty-plugin: 'on-crashped-unbundled' + - senty-plugin: 'on-crashpad-unbundled' sentry-plugin-enable: 'on' sentry-backend: 'crashpad' sentry-bundled-crashpad-handler: 'off' From 9418ee9cc1a78455d1fa961f2dd778f58c895d16 Mon Sep 17 00:00:00 2001 From: Hannes Winkler Date: Sun, 2 Nov 2025 22:58:25 +0100 Subject: [PATCH 2/3] ci: reformat cmake.yml --- .github/workflows/cmake.yml | 152 ++++++++++++++++++------------------ 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d85c56c4..017c2350 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -2,9 +2,9 @@ name: CMake on: push: - branches: [ master, feature/gh-actions, feature/compositor-ng ] + branches: [master, feature/gh-actions, feature/compositor-ng] pull_request: - branches: [ master, feature/gh-actions, feature/compositor-ng ] + branches: [master, feature/gh-actions, feature/compositor-ng] workflow_dispatch: jobs: @@ -27,26 +27,26 @@ jobs: - Debug - Release include: - - graphics-backends: 'vulkan-only' - enable-vulkan: 'on' - enable-opengl: 'off' - - - graphics-backends: 'opengl-only' - enable-vulkan: 'off' - enable-opengl: 'on' - - - graphics-backends: 'vulkan-and-opengl' - enable-vulkan: 'on' - enable-opengl: 'on' - - - enable-opengl: 'on' - opengl-deps: 'libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev' - - - enable-vulkan: 'on' - vulkan-deps: 'libvulkan-dev' - - - compiler: 'clang' - clang-deps: 'clang' + - graphics-backends: "vulkan-only" + enable-vulkan: "on" + enable-opengl: "off" + + - graphics-backends: "opengl-only" + enable-vulkan: "off" + enable-opengl: "on" + + - graphics-backends: "vulkan-and-opengl" + enable-vulkan: "on" + enable-opengl: "on" + + - enable-opengl: "on" + opengl-deps: "libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev" + + - enable-vulkan: "on" + vulkan-deps: "libvulkan-dev" + + - compiler: "clang" + clang-deps: "clang" steps: # On the self-hosted runners, we assume those are already installed. # - name: Install dependencies @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v3 with: - submodules: 'recursive' + submodules: "recursive" - name: Configure CMake run: | @@ -94,8 +94,8 @@ jobs: strategy: matrix: container: - - 'debian:bullseye' - - 'debian:buster' + - "debian:bullseye" + - "debian:buster" graphics-backends: - vulkan-only - opengl-only @@ -107,57 +107,57 @@ jobs: - Debug - Release sentry-plugin: - - 'off' - - 'on-inproc' - - 'on-crashpad-bundled' - - 'on-crashpad-unbundled' + - "off" + - "on-inproc" + - "on-crashpad-bundled" + - "on-crashpad-unbundled" include: - - graphics-backends: 'vulkan-only' - enable-vulkan: 'on' - enable-opengl: 'off' - - - graphics-backends: 'opengl-only' - enable-vulkan: 'off' - enable-opengl: 'on' - - - graphics-backends: 'vulkan-and-opengl' - enable-vulkan: 'on' - enable-opengl: 'on' - - - enable-opengl: 'on' - opengl-deps: 'libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev' - - - enable-vulkan: 'on' - vulkan-deps: 'libvulkan-dev' - - - compiler: 'gcc' - cxx-compiler: 'g++' - gcc-deps: 'gcc g++' - - - compiler: 'clang' - cxx-compiler: 'clang++' - clang-deps: 'clang' - - - sentry-plugin: 'off' - sentry-plugin-enable: 'off' - sentry-deps: '' - - - sentry-plugin: 'on-inproc' - sentry-plugin-enable: 'on' - sentry-backend: 'inproc' - sentry-deps: 'libcurl4-openssl-dev' - - - sentry-plugin: 'on-crashpad-bundled' - sentry-plugin-enable: 'on' - sentry-backend: 'crashpad' - sentry-bundled-crashpad-handler: 'on' - sentry-deps: 'libcurl4-openssl-dev' - - - senty-plugin: 'on-crashpad-unbundled' - sentry-plugin-enable: 'on' - sentry-backend: 'crashpad' - sentry-bundled-crashpad-handler: 'off' - sentry-deps: 'libcurl4-openssl-dev' + - graphics-backends: "vulkan-only" + enable-vulkan: "on" + enable-opengl: "off" + + - graphics-backends: "opengl-only" + enable-vulkan: "off" + enable-opengl: "on" + + - graphics-backends: "vulkan-and-opengl" + enable-vulkan: "on" + enable-opengl: "on" + + - enable-opengl: "on" + opengl-deps: "libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev" + + - enable-vulkan: "on" + vulkan-deps: "libvulkan-dev" + + - compiler: "gcc" + cxx-compiler: "g++" + gcc-deps: "gcc g++" + + - compiler: "clang" + cxx-compiler: "clang++" + clang-deps: "clang" + + - sentry-plugin: "off" + sentry-plugin-enable: "off" + sentry-deps: "" + + - sentry-plugin: "on-inproc" + sentry-plugin-enable: "on" + sentry-backend: "inproc" + sentry-deps: "libcurl4-openssl-dev" + + - sentry-plugin: "on-crashpad-bundled" + sentry-plugin-enable: "on" + sentry-backend: "crashpad" + sentry-bundled-crashpad-handler: "on" + sentry-deps: "libcurl4-openssl-dev" + + - senty-plugin: "on-crashpad-unbundled" + sentry-plugin-enable: "on" + sentry-backend: "crashpad" + sentry-bundled-crashpad-handler: "off" + sentry-deps: "libcurl4-openssl-dev" steps: # git needs to be installed before checking out, otherwise the checkout will fallback to the REST API, # and the submodule download won't work. @@ -175,7 +175,7 @@ jobs: - uses: actions/checkout@v3 with: - submodules: 'recursive' + submodules: "recursive" - name: Configure CMake run: | From 7718897515c831a8040ccb18ddf829d2ac5f9dcc Mon Sep 17 00:00:00 2001 From: Hannes Winkler Date: Sun, 2 Nov 2025 23:00:46 +0100 Subject: [PATCH 3/3] remove debian:buster, and add debian:trixie, bookworm containers --- .github/workflows/cmake.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 017c2350..d0b41256 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -94,8 +94,9 @@ jobs: strategy: matrix: container: + - "debian:trixie" + - "debian:bookworm" - "debian:bullseye" - - "debian:buster" graphics-backends: - vulkan-only - opengl-only