From 6a7f59ab8d91dbc83c62414054bd76dd9d97e8b3 Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 10:23:13 +0000 Subject: [PATCH 01/23] Replace Linux CI Ubuntu 20.04 with 24.04 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12d34df..644bd2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-${{ matrix.os }} strategy: matrix: - os: [20.04, 22.04] + os: [22.04, 24.04] steps: - uses: actions/checkout@v4 with: From 44d27805d1918a5c678fe82c6cf85c6edab8538b Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 10:23:29 +0000 Subject: [PATCH 02/23] Move Windows CI from 2022 to 2025 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 644bd2f..0b7ef16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: build_windows: name: Windows - runs-on: windows-2022 + runs-on: windows-2025 steps: - uses: actions/checkout@v4 with: @@ -62,7 +62,7 @@ jobs: build_windows_clang: name: Windows Clang - runs-on: windows-2022 + runs-on: windows-2025 steps: - uses: actions/checkout@v4 with: From b126fcfeab48eeffaeb867943faa8f015c8ed498 Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 10:23:40 +0000 Subject: [PATCH 03/23] Move MacOS CI from 13 to 14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b7ef16..f8dd00b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: build_macos: name: MacOS - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v4 with: From c0b65b7edc58320b419dfaad5ee42739b0d56e6d Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 10:24:23 +0000 Subject: [PATCH 04/23] Move Windows CD from 2022 to 2025 --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 279fd98..eda556f 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -22,7 +22,7 @@ concurrency: jobs: cd_windows_x64: name: Windows - runs-on: windows-2022 + runs-on: windows-2025 env: OUTPUT: EndlessSkyEditor-win64-continuous.zip GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 524efda0379940f00a02bcf0c97bbf5ae58661de Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 10:24:33 +0000 Subject: [PATCH 05/23] Move MacOS CD from 13 to 14 --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index eda556f..3ce334b 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -56,7 +56,7 @@ jobs: cd_macos_x64: name: MacOS - runs-on: macos-13 + runs-on: macos-14 env: OUTPUT: EndlessSkyEditor-macOS-continuous.zip GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 73c3a18d67f9c242402ea404c88ded467f3bfa2c Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 10:38:24 +0000 Subject: [PATCH 06/23] Update vcpkg to 2025.12.12 --- vcpkg-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 757bab2..d06ca83 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "builtin", - "baseline": "1f124eb6b188994a2e0fb7894690c69e600633ae" + "baseline": "84bab45d415d22042bd0b9081aea57f362da3f35" }, "overlay-triplets": [ "./utils/overlays" ] } From c770fc252ff49de552f2bbc08a42505180e32f0d Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 14:14:23 +0000 Subject: [PATCH 07/23] Switch vcpkg to 2025.06.13 --- vcpkg-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index d06ca83..237a777 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "builtin", - "baseline": "84bab45d415d22042bd0b9081aea57f362da3f35" + "baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0" }, "overlay-triplets": [ "./utils/overlays" ] } From 6bc9aa71ef5b525985c4c3a6ea6dd0eb2c1810f8 Mon Sep 17 00:00:00 2001 From: warp-core Date: Wed, 21 Jan 2026 14:14:41 +0000 Subject: [PATCH 08/23] Update Qtbase feature requirements --- vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 3cd10e4..1000868 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,7 +3,6 @@ { "name": "qtbase", "features": [ - "default-features", "icu", "gui", "jpeg", From af9f1e93d6bcc6731b89d142c8784873e483a684 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:18:06 +0000 Subject: [PATCH 09/23] Try fix Linux build --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8dd00b..4fb53cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,10 @@ jobs: run: | sudo rm /etc/apt/sources.list.d/* && sudo dpkg --clear-avail # Speed up installation and get rid of unwanted lists sudo apt-get update - sudo apt-get install -y --no-install-recommends autoconf-archive libx11-xcb-dev libxrender-dev libxkbcommon-x11-dev \ + # sudo apt-get install -y --no-install-recommends autoconf-archive + sudo apt-get install -y --no-install-recommends libx11-xcb-dev + sudo apt-get install -y --no-install-recommends libxrender-dev + sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev \ libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev \ libosmesa6 mesa-utils libglvnd-dev x11-utils '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 From b5420759f784ba6ea3788b43687856b9a89f2235 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:20:34 +0000 Subject: [PATCH 10/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fb53cf..eb438fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: sudo rm /etc/apt/sources.list.d/* && sudo dpkg --clear-avail # Speed up installation and get rid of unwanted lists sudo apt-get update # sudo apt-get install -y --no-install-recommends autoconf-archive - sudo apt-get install -y --no-install-recommends libx11-xcb-dev + # sudo apt-get install -y --no-install-recommends libx11-xcb-dev sudo apt-get install -y --no-install-recommends libxrender-dev sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev \ libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev \ From 76fa951ba85f025c99e230fc117c130ce4551a8f Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:21:56 +0000 Subject: [PATCH 11/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb438fb..f3d6870 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: sudo apt-get update # sudo apt-get install -y --no-install-recommends autoconf-archive # sudo apt-get install -y --no-install-recommends libx11-xcb-dev - sudo apt-get install -y --no-install-recommends libxrender-dev + # sudo apt-get install -y --no-install-recommends libxrender-dev sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev \ libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev \ libosmesa6 mesa-utils libglvnd-dev x11-utils '^libxcb.*-dev' From 0f789f06584aac599ecd1df61f12052470b42a0d Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:22:40 +0000 Subject: [PATCH 12/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3d6870..c4fd6cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: # sudo apt-get install -y --no-install-recommends autoconf-archive # sudo apt-get install -y --no-install-recommends libx11-xcb-dev # sudo apt-get install -y --no-install-recommends libxrender-dev - sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev \ + # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev \ libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev \ libosmesa6 mesa-utils libglvnd-dev x11-utils '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 From 4698279e0f31894fff347dc6cccb3d45ec5e8b44 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:25:50 +0000 Subject: [PATCH 13/23] Update ci.yml --- .github/workflows/ci.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4fd6cc..e1b2d55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,9 +37,20 @@ jobs: # sudo apt-get install -y --no-install-recommends autoconf-archive # sudo apt-get install -y --no-install-recommends libx11-xcb-dev # sudo apt-get install -y --no-install-recommends libxrender-dev - # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev \ - libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev \ - libosmesa6 mesa-utils libglvnd-dev x11-utils '^libxcb.*-dev' + sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev + sudo apt-get install -y --no-install-recommends libxmu-dev + sudo apt-get install -y --no-install-recommends libxi-dev + sudo apt-get install -y --no-install-recommends libgl-dev + sudo apt-get install -y --no-install-recommends libglu1-mesa-dev + sudo apt-get install -y --no-install-recommends libgles2-mesa-dev + sudo apt-get install -y --no-install-recommends libwayland-dev + sudo apt-get install -y --no-install-recommends libxkbcommon-dev + sudo apt-get install -y --no-install-recommends libegl1-mesa-dev + sudo apt-get install -y --no-install-recommends libosmesa6 + sudo apt-get install -y --no-install-recommends mesa-utils + sudo apt-get install -y --no-install-recommends libglvnd-dev + sudo apt-get install -y --no-install-recommends x11-utils + sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 - uses: lukka/run-vcpkg@v11 - uses: lukka/run-cmake@v10 From 2dd7c160a8fdd811a6cfbbe252780b54e26b5754 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:26:40 +0000 Subject: [PATCH 14/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1b2d55..01fc5ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: # sudo apt-get install -y --no-install-recommends autoconf-archive # sudo apt-get install -y --no-install-recommends libx11-xcb-dev # sudo apt-get install -y --no-install-recommends libxrender-dev - sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev + # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev sudo apt-get install -y --no-install-recommends libxmu-dev sudo apt-get install -y --no-install-recommends libxi-dev sudo apt-get install -y --no-install-recommends libgl-dev From 18a01093dc5ae855a5591d0aa058f051d76b7c5c Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:28:18 +0000 Subject: [PATCH 15/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01fc5ea..fdda4c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: # sudo apt-get install -y --no-install-recommends libx11-xcb-dev # sudo apt-get install -y --no-install-recommends libxrender-dev # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev - sudo apt-get install -y --no-install-recommends libxmu-dev + # sudo apt-get install -y --no-install-recommends libxmu-dev sudo apt-get install -y --no-install-recommends libxi-dev sudo apt-get install -y --no-install-recommends libgl-dev sudo apt-get install -y --no-install-recommends libglu1-mesa-dev From 60d18fb39296f18e30e009f9c777040380f98bf4 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:29:45 +0000 Subject: [PATCH 16/23] Update ci.yml --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdda4c6..1b6df14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,18 +39,18 @@ jobs: # sudo apt-get install -y --no-install-recommends libxrender-dev # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev # sudo apt-get install -y --no-install-recommends libxmu-dev - sudo apt-get install -y --no-install-recommends libxi-dev - sudo apt-get install -y --no-install-recommends libgl-dev - sudo apt-get install -y --no-install-recommends libglu1-mesa-dev - sudo apt-get install -y --no-install-recommends libgles2-mesa-dev - sudo apt-get install -y --no-install-recommends libwayland-dev - sudo apt-get install -y --no-install-recommends libxkbcommon-dev - sudo apt-get install -y --no-install-recommends libegl1-mesa-dev - sudo apt-get install -y --no-install-recommends libosmesa6 - sudo apt-get install -y --no-install-recommends mesa-utils - sudo apt-get install -y --no-install-recommends libglvnd-dev - sudo apt-get install -y --no-install-recommends x11-utils - sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' + # sudo apt-get install -y --no-install-recommends libxi-dev + # sudo apt-get install -y --no-install-recommends libgl-dev + # sudo apt-get install -y --no-install-recommends libglu1-mesa-dev + # sudo apt-get install -y --no-install-recommends libgles2-mesa-dev + # sudo apt-get install -y --no-install-recommends libwayland-dev + # sudo apt-get install -y --no-install-recommends libxkbcommon-dev + # sudo apt-get install -y --no-install-recommends libegl1-mesa-dev + # sudo apt-get install -y --no-install-recommends libosmesa6 + # sudo apt-get install -y --no-install-recommends mesa-utils + # sudo apt-get install -y --no-install-recommends libglvnd-dev + # sudo apt-get install -y --no-install-recommends x11-utils + # sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 - uses: lukka/run-vcpkg@v11 - uses: lukka/run-cmake@v10 From 760998c321cb1a43d3722e01972f10c8623682b4 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:40:32 +0000 Subject: [PATCH 17/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b6df14..da816cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: run: | sudo rm /etc/apt/sources.list.d/* && sudo dpkg --clear-avail # Speed up installation and get rid of unwanted lists sudo apt-get update - # sudo apt-get install -y --no-install-recommends autoconf-archive + sudo apt-get install -y --no-install-recommends autoconf-archive # sudo apt-get install -y --no-install-recommends libx11-xcb-dev # sudo apt-get install -y --no-install-recommends libxrender-dev # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev From 8f86ebe3a5e6569da2e653dd7bd7f72371a1e8b9 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:41:49 +0000 Subject: [PATCH 18/23] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da816cd..8cd1841 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-${{ matrix.os }} strategy: matrix: - os: [22.04, 24.04] + os: [22.04] steps: - uses: actions/checkout@v4 with: From fd5a24b618ccdcecac589d47ad9094837b052b27 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:42:38 +0000 Subject: [PATCH 19/23] Update ci.yml --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cd1841..291265b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,11 @@ concurrency: jobs: build_ubuntu: name: Ubuntu - runs-on: ubuntu-${{ matrix.os }} - strategy: - matrix: - os: [22.04] + runs-on: ubuntu-22.04 + #runs-on: ubuntu-${{ matrix.os }} + #strategy: + # matrix: + # os: [22.04] steps: - uses: actions/checkout@v4 with: From 2a5845c25cb9d378ee93ab81f53e17bba3a58714 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 11:52:04 +0000 Subject: [PATCH 20/23] Update ci.yml --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 291265b..9eba78b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,22 +36,22 @@ jobs: sudo rm /etc/apt/sources.list.d/* && sudo dpkg --clear-avail # Speed up installation and get rid of unwanted lists sudo apt-get update sudo apt-get install -y --no-install-recommends autoconf-archive - # sudo apt-get install -y --no-install-recommends libx11-xcb-dev - # sudo apt-get install -y --no-install-recommends libxrender-dev - # sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev + sudo apt-get install -y --no-install-recommends libx11-xcb-dev + sudo apt-get install -y --no-install-recommends libxrender-dev + sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev # sudo apt-get install -y --no-install-recommends libxmu-dev - # sudo apt-get install -y --no-install-recommends libxi-dev + sudo apt-get install -y --no-install-recommends libxi-dev # sudo apt-get install -y --no-install-recommends libgl-dev - # sudo apt-get install -y --no-install-recommends libglu1-mesa-dev + sudo apt-get install -y --no-install-recommends libglu1-mesa-dev # sudo apt-get install -y --no-install-recommends libgles2-mesa-dev # sudo apt-get install -y --no-install-recommends libwayland-dev - # sudo apt-get install -y --no-install-recommends libxkbcommon-dev - # sudo apt-get install -y --no-install-recommends libegl1-mesa-dev + sudo apt-get install -y --no-install-recommends libxkbcommon-dev + sudo apt-get install -y --no-install-recommends libegl1-mesa-dev # sudo apt-get install -y --no-install-recommends libosmesa6 # sudo apt-get install -y --no-install-recommends mesa-utils # sudo apt-get install -y --no-install-recommends libglvnd-dev # sudo apt-get install -y --no-install-recommends x11-utils - # sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' + sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 - uses: lukka/run-vcpkg@v11 - uses: lukka/run-cmake@v10 From db34f7a92614ac4288c1b57b5c39c703a237a1a0 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 12:08:19 +0000 Subject: [PATCH 21/23] Update ci.yml --- .github/workflows/ci.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9eba78b..a53b832 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,23 +35,9 @@ jobs: run: | sudo rm /etc/apt/sources.list.d/* && sudo dpkg --clear-avail # Speed up installation and get rid of unwanted lists sudo apt-get update - sudo apt-get install -y --no-install-recommends autoconf-archive - sudo apt-get install -y --no-install-recommends libx11-xcb-dev - sudo apt-get install -y --no-install-recommends libxrender-dev - sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev - # sudo apt-get install -y --no-install-recommends libxmu-dev - sudo apt-get install -y --no-install-recommends libxi-dev - # sudo apt-get install -y --no-install-recommends libgl-dev - sudo apt-get install -y --no-install-recommends libglu1-mesa-dev - # sudo apt-get install -y --no-install-recommends libgles2-mesa-dev - # sudo apt-get install -y --no-install-recommends libwayland-dev - sudo apt-get install -y --no-install-recommends libxkbcommon-dev - sudo apt-get install -y --no-install-recommends libegl1-mesa-dev - # sudo apt-get install -y --no-install-recommends libosmesa6 - # sudo apt-get install -y --no-install-recommends mesa-utils - # sudo apt-get install -y --no-install-recommends libglvnd-dev - # sudo apt-get install -y --no-install-recommends x11-utils - sudo apt-get install -y --no-install-recommends '^libxcb.*-dev' + sudo apt-get install -y --no-install-recommends autoconf-archive libx11-xcb-dev libxrender-dev \ + libxkbcommon-x11-dev libxi-dev libglu1-mesa-dev libxkbcommon-dev \ + libegl1-mesa-dev '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 - uses: lukka/run-vcpkg@v11 - uses: lukka/run-cmake@v10 From 4620da4d0b6c76eb60418dace2d48aa512fb0d89 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 12:40:52 +0000 Subject: [PATCH 22/23] Disable MacOS CI/CD --- .github/workflows/cd.yaml | 70 +++++++++++++++++++-------------------- .github/workflows/ci.yml | 30 ++++++++--------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 3ce334b..5a56a93 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -54,33 +54,33 @@ jobs: path: ${{ env.OUTPUT }} - cd_macos_x64: - name: MacOS - runs-on: macos-14 - env: - OUTPUT: EndlessSkyEditor-macOS-continuous.zip - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - uses: actions/checkout@v4 - with: - show-progress: false - - name: Install pkg-config - run: brew install automake autoconf-archive - - uses: lukka/get-cmake@v3.28.3 - - uses: lukka/run-vcpkg@v11 - - uses: lukka/run-cmake@v10 - with: - configurePreset: 'macos-release' - buildPreset: 'macos-ci-release' - - name: Package Application - run: | - cmake --install build/release - 7z a ${{ env.OUTPUT }} "./install/release/*" - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: ${{ env.OUTPUT }} - path: ${{ env.OUTPUT }} + #cd_macos_x64: + # name: MacOS + # runs-on: macos-14 + # env: + # OUTPUT: EndlessSkyEditor-macOS-continuous.zip + # GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # steps: + # - uses: actions/checkout@v4 + # with: + # show-progress: false + # - name: Install pkg-config + # run: brew install automake autoconf-archive + # - uses: lukka/get-cmake@v3.28.3 + # - uses: lukka/run-vcpkg@v11 + # - uses: lukka/run-cmake@v10 + # with: + # configurePreset: 'macos-release' + # buildPreset: 'macos-ci-release' + # - name: Package Application + # run: | + # cmake --install build/release + # 7z a ${{ env.OUTPUT }} "./install/release/*" + # - name: Upload artifact + # uses: actions/upload-artifact@v4 + # with: + # name: ${{ env.OUTPUT }} + # path: ${{ env.OUTPUT }} cd_upload_artifacts_to_release: @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest needs: - cd_windows_x64 - - cd_macos_x64 + #- cd_macos_x64 permissions: contents: write env: @@ -145,10 +145,10 @@ jobs: --replace \ --name ${{ env.OUTPUT_WINDOWS }} \ --file ${{ env.OUTPUT_WINDOWS }}/${{ env.OUTPUT_WINDOWS }} - - name: Add ${{ env.OUTPUT_MACOS }} to release tag - run: | - github-release upload \ - --tag continuous \ - --replace \ - --name ${{ env.OUTPUT_MACOS }} \ - --file ${{ env.OUTPUT_MACOS }}/${{ env.OUTPUT_MACOS }} + #- name: Add ${{ env.OUTPUT_MACOS }} to release tag + # run: | + # github-release upload \ + # --tag continuous \ + # --replace \ + # --name ${{ env.OUTPUT_MACOS }} \ + # --file ${{ env.OUTPUT_MACOS }}/${{ env.OUTPUT_MACOS }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a53b832..44d6417 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,19 +76,19 @@ jobs: buildPreset: 'clang-cl-ci-release' - build_macos: - name: MacOS - runs-on: macos-14 - steps: - - uses: actions/checkout@v4 - with: - show-progress: false - - name: Install pkg-config - run: brew install automake autoconf-archive - - uses: lukka/get-cmake@v3.28.3 - - uses: lukka/run-vcpkg@v11 - - uses: lukka/run-cmake@v10 - with: - configurePreset: 'macos-release' - buildPreset: 'macos-ci-release' + #build_macos: + # name: MacOS + # runs-on: macos-14 + # steps: + # - uses: actions/checkout@v4 + # with: + # show-progress: false + # - name: Install pkg-config + # run: brew install automake autoconf-archive + # - uses: lukka/get-cmake@v3.28.3 + # - uses: lukka/run-vcpkg@v11 + # - uses: lukka/run-cmake@v10 + # with: + # configurePreset: 'macos-release' + # buildPreset: 'macos-ci-release' From 788bf927d41c9ca42566054fb9e5f074597ced39 Mon Sep 17 00:00:00 2001 From: warp-core Date: Thu, 22 Jan 2026 13:05:59 +0000 Subject: [PATCH 23/23] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0bd77d..3b77c93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,9 +31,9 @@ jobs: run: | sudo rm /etc/apt/sources.list.d/* && sudo dpkg --clear-avail # Speed up installation and get rid of unwanted lists sudo apt-get update - sudo apt-get install -y --no-install-recommends autoconf-archive libx11-xcb-dev libxrender-dev \ - libxkbcommon-x11-dev libxi-dev libglu1-mesa-dev libxkbcommon-dev \ - libegl1-mesa-dev '^libxcb.*-dev' + sudo apt-get install -y --no-install-recommends autoconf-archive libx11-xcb-dev libxrender-dev libxkbcommon-x11-dev \ + libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev \ + libosmesa6 mesa-utils libglvnd-dev x11-utils '^libxcb.*-dev' - uses: lukka/get-cmake@v3.28.3 - uses: lukka/run-vcpkg@v11 - uses: lukka/run-cmake@v10