From 738d36e804458cc35695425041a6957ecd95bebf Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 17:15:57 -0800 Subject: [PATCH 01/23] Updated mac.yml --- .github/workflows/mac.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 46dfba8..483e5fd 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -36,15 +36,14 @@ jobs: run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license - name: Setting up Conan profile - run: conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git + # run: conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git + run: conan config install https://github.com/engine3d-dev/conan-config.git - - name: Installing Atlas repositories - run: | - conan remote add engine3d-conan https://libhal.jfrog.io/artifactory/api/conan/engine3d-conan - conan remote add libhal-trunk https://libhal.jfrog.io/artifactory/api/conan/trunk-conan + - name: Setting up vulkan-cpp Development Environment + run: conan atlas setup - name: Building vulkan-cpp run: | - conan create . -b missing -s build_type=Release -pr mac_armv8 - conan create . -b missing -s build_type=Debug -pr mac_armv8 - conan create . -b missing -s build_type=MinSizeRel -pr mac_armv8 \ No newline at end of file + conan atlas create . -b missing -s build_type=Release + conan atlas create . -b missing -s build_type=Debug + conan atlas create . -b missing -s build_type=MinSizeRel \ No newline at end of file From 63cd3ec42553c238925dca59ed21c53ae98fbca9 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 22:18:03 -0800 Subject: [PATCH 02/23] Updated mac.yml --- .github/workflows/mac.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 483e5fd..8f5d322 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -40,7 +40,9 @@ jobs: run: conan config install https://github.com/engine3d-dev/conan-config.git - name: Setting up vulkan-cpp Development Environment - run: conan atlas setup + run: | + conan atlas setup + conan atlas update - name: Building vulkan-cpp run: | From 545f689ca89c6de5189b6a30b9f294a256ab9271 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 22:24:58 -0800 Subject: [PATCH 03/23] Updated mac.yml --- .github/workflows/mac.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 8f5d322..b4bda94 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -37,12 +37,10 @@ jobs: - name: Setting up Conan profile # run: conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git - run: conan config install https://github.com/engine3d-dev/conan-config.git + run: conan atlas update - name: Setting up vulkan-cpp Development Environment - run: | - conan atlas setup - conan atlas update + run: conan atlas setup - name: Building vulkan-cpp run: | From 3933df4a6a13700f1cd5134f4ad846ec0bb2b7ae Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 22:27:30 -0800 Subject: [PATCH 04/23] Updated mac.yml --- .github/workflows/mac.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index b4bda94..9016f0f 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -36,8 +36,9 @@ jobs: run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license - name: Setting up Conan profile - # run: conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git - run: conan atlas update + run: | + conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git + conan atlas update - name: Setting up vulkan-cpp Development Environment run: conan atlas setup From a8202b2475b1b38fffd000e972eb4659d9ddbb19 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 22:30:13 -0800 Subject: [PATCH 05/23] Updated conan-config commands --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 9016f0f..bf0e961 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -37,7 +37,7 @@ jobs: - name: Setting up Conan profile run: | - conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git + conan config install https://github.com/engine3d-dev/conan-config.git conan atlas update - name: Setting up vulkan-cpp Development Environment From 07291bd946b2566fccdb114aabd75913f63c7416 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 22:41:51 -0800 Subject: [PATCH 06/23] Updated conan-config commands --- .github/workflows/mac.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index bf0e961..84582e7 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -45,6 +45,6 @@ jobs: - name: Building vulkan-cpp run: | - conan atlas create . -b missing -s build_type=Release - conan atlas create . -b missing -s build_type=Debug - conan atlas create . -b missing -s build_type=MinSizeRel \ No newline at end of file + conan atlas create . -s build_type=Release + conan atlas create . -s build_type=Debug + conan atlas create . -s build_type=MinSizeRel \ No newline at end of file From 27763b63b227e879c1ccfa834449d47ce3b8cd98 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sat, 17 Jan 2026 22:47:20 -0800 Subject: [PATCH 07/23] Updated conan-config commands --- .github/workflows/mac.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 84582e7..c43826a 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -35,14 +35,12 @@ jobs: - name: Install Rosetta run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license - - name: Setting up Conan profile + - name: Setting up Conan configuration run: | conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup conan atlas update - - name: Setting up vulkan-cpp Development Environment - run: conan atlas setup - - name: Building vulkan-cpp run: | conan atlas create . -s build_type=Release From 81e662cc38f1e8ecb468d9bafbde2328e5facc80 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:01:29 -0800 Subject: [PATCH 08/23] Updated mac.yml --- .github/workflows/mac.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index c43826a..f4e1671 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -39,7 +39,6 @@ jobs: run: | conan config install https://github.com/engine3d-dev/conan-config.git conan atlas setup - conan atlas update - name: Building vulkan-cpp run: | From e9d488635e5051510ee58ead158fd1b7121659f1 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:04:57 -0800 Subject: [PATCH 09/23] Updated mac.yml --- .github/workflows/mac.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index f4e1671..eb2332d 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -40,8 +40,16 @@ jobs: conan config install https://github.com/engine3d-dev/conan-config.git conan atlas setup - - name: Building vulkan-cpp - run: | - conan atlas create . -s build_type=Release - conan atlas create . -s build_type=Debug - conan atlas create . -s build_type=MinSizeRel \ No newline at end of file + # - name: Building vulkan-cpp + # run: | + # conan atlas create . -s build_type=Release + # conan atlas create . -s build_type=Debug + # conan atlas create . -s build_type=MinSizeRel + - name: Creating Release build for vulkan-cpp + run: conan atlas create . -s build_type=Release + + - name: Creating Debug build for vulkan-cpp + run: conan atlas create . -s build_type=Debug + + - name: Creating MinSizeRel build for vulkan-cpp + run: conan atlas create -s build_type=MinSizeRel \ No newline at end of file From 04e23a1bd52cbd8fac6e945cdc32a569924063ac Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:06:25 -0800 Subject: [PATCH 10/23] Updated linux.yml --- .github/workflows/linux.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index eb1a7bd..8552885 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -37,20 +37,20 @@ jobs: - name: Setting up Conan Profiles run: conan config install -sf profiles/x86_64/linux/ -tf profiles https://github.com/engine3d-dev/conan-config.git - - name: Adding Conan remote dependencies + - name: Setting up Conan run: | - conan remote add engine3d-conan https://libhal.jfrog.io/artifactory/api/conan/engine3d-conan - conan remote add libhal-trunk https://libhal.jfrog.io/artifactory/api/conan/trunk-conan + conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup - - name: Creating Release build for vulkan-cpp - shell: pwsh - run: conan create . -b missing -s build_type=Release -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + - name: Creating Release build for vulkan-cpp + # run: conan create . -b missing -s build_type=Release -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + run: conan atlas create -s build_type=Release - - name: Creating Debug build for vulkan-cpp - shell: pwsh - run: conan create . -b missing -s build_type=Debug -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + - name: Creating Debug build for vulkan-cpp + # run: conan create . -b missing -s build_type=Debug -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + run: conan atlas create -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp - shell: pwsh - run: conan create . -b missing -s build_type=MinSizeRel -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + # run: conan create . -b missing -s build_type=MinSizeRel -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + run: conan atlas create -s build_type=MinSizeRel From ec0713f7f1d8f940a9c28405495e5f6281257b74 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:07:36 -0800 Subject: [PATCH 11/23] Updated linux.yml --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8552885..9931417 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -44,13 +44,13 @@ jobs: - name: Creating Release build for vulkan-cpp # run: conan create . -b missing -s build_type=Release -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install - run: conan atlas create -s build_type=Release + run: conan atlas create . -s build_type=Release - name: Creating Debug build for vulkan-cpp # run: conan create . -b missing -s build_type=Debug -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install - run: conan atlas create -s build_type=Debug + run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp # run: conan create . -b missing -s build_type=MinSizeRel -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install - run: conan atlas create -s build_type=MinSizeRel + run: conan atlas create . -s build_type=MinSizeRel From 02614e813413b57897bc2edcf6ed9b42afff413e Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:46:11 -0800 Subject: [PATCH 12/23] Updated windows.yml --- .github/workflows/windows.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 269443a..7c16cea 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,36 +22,28 @@ jobs: clang++ --version choco install git make mingw - # - name: Installing Vulkan SDK - # shell: pwsh - # # run: winget install --id=KhronosGroup.VulkanSDK -e --accept-licenses --default-answer --confirm-command install - # run: | - # winget install --id=KhronosGroup.VulkanSDK -e --force --silent --accept-package-agreements --accept-source-agreements - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.1 with: vulkan-query-version: 1.4.304.1 vulkan-components: Vulkan-Headers, Vulkan-Loader vulkan-use-cache: true - - name: Pip installing conan shell: pwsh - run: pip install conan - - - name: Setting up conan profiles - shell: pwsh - run: conan config install -sf profiles/x86_64/Windows/ -tf profiles https://github.com/engine3d-dev/conan-config.git + run: pipx install conan - - name: Setting up packages + - name: Setting up Conan configuration shell: pwsh run: | - conan remote add engine3d-conan https://libhal.jfrog.io/artifactory/api/conan/engine3d-conan - conan remote add libhal-trunk https://libhal.jfrog.io/artifactory/api/conan/trunk-conan + conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup - - name: Building vulkan-cpp - shell: pwsh - run: | - conan create . -b missing -s build_type=Release -pr windows_x86_64 - conan create . -b missing -s build_type=Debug -pr windows_x86_64 - conan create . -b missing -s build_type=MinSizeRel -pr windows_x86_64 \ No newline at end of file + - name: Creating Release build for vulkan-cpp + run: conan atlas create . -s build_type=Release + + - name: Creating Debug build for vulkan-cpp + run: conan atlas create . -s build_type=Debug + + - name: Creating MinSizeRel build for vulkan-cpp + run: conan atlas create -s build_type=MinSizeRel \ No newline at end of file From e98f2c8e0b863e70de4edf7f3849d54d1b75d463 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:50:58 -0800 Subject: [PATCH 13/23] Updated windows.yml --- .github/workflows/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7c16cea..3b06ecf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,11 +30,9 @@ jobs: vulkan-use-cache: true - name: Pip installing conan - shell: pwsh - run: pipx install conan + run: pip install conan - name: Setting up Conan configuration - shell: pwsh run: | conan config install https://github.com/engine3d-dev/conan-config.git conan atlas setup From 09871873d3b17baba3803696f027a7793e784a3e Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 00:54:42 -0800 Subject: [PATCH 14/23] Updated windows.yml --- .github/workflows/windows.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3b06ecf..e54e51b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,18 +30,23 @@ jobs: vulkan-use-cache: true - name: Pip installing conan + shell: pwsh run: pip install conan - name: Setting up Conan configuration + shell: pwsh run: | conan config install https://github.com/engine3d-dev/conan-config.git conan atlas setup - name: Creating Release build for vulkan-cpp + shell: pwsh run: conan atlas create . -s build_type=Release - name: Creating Debug build for vulkan-cpp + shell: pwsh run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp - run: conan atlas create -s build_type=MinSizeRel \ No newline at end of file + shell: pwsh + run: conan atlas create . -s build_type=MinSizeRel \ No newline at end of file From 1d5e35c4e951ec4b487f5202dad01368cf23ba3a Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:14:45 -0800 Subject: [PATCH 15/23] Updated windows.yml --- .github/workflows/windows.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e54e51b..fc6f605 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,12 +15,7 @@ jobs: - name: Install tooling with Choco shell: pwsh - run: | - choco install cmake.install --version=3.31.6 - cmake --version - choco install llvm --version=20.1.4 - clang++ --version - choco install git make mingw + run: choco install git - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.1 From 75d6a465cefbb4d9969746be85b06fd1ec11e6a5 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:21:44 -0800 Subject: [PATCH 16/23] Finalizing windows.yml --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fc6f605..864d1ef 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,7 @@ jobs: shell: pwsh run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - - name: Install tooling with Choco + - name: Installing Git shell: pwsh run: choco install git From 6e56f5c9e8106ec7b8269f934abb243a10d74506 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:30:33 -0800 Subject: [PATCH 17/23] Small code cleanup and added a small fix to mac.yml for the atlas create command --- .github/workflows/linux.yml | 6 ------ .github/workflows/mac.yml | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9931417..11d337b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,9 +9,6 @@ jobs: steps: - uses: actions/checkout@v4 - # - name: Install LLVM - # run: wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh - - name: Install LLVM's C++ Standard Library run: sudo apt-get install libc++-20-dev libc++abi-20-dev @@ -43,14 +40,11 @@ jobs: conan atlas setup - name: Creating Release build for vulkan-cpp - # run: conan create . -b missing -s build_type=Release -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install run: conan atlas create . -s build_type=Release - name: Creating Debug build for vulkan-cpp - # run: conan create . -b missing -s build_type=Debug -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp - # run: conan create . -b missing -s build_type=MinSizeRel -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install run: conan atlas create . -s build_type=MinSizeRel diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index eb2332d..51ad69b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -40,11 +40,6 @@ jobs: conan config install https://github.com/engine3d-dev/conan-config.git conan atlas setup - # - name: Building vulkan-cpp - # run: | - # conan atlas create . -s build_type=Release - # conan atlas create . -s build_type=Debug - # conan atlas create . -s build_type=MinSizeRel - name: Creating Release build for vulkan-cpp run: conan atlas create . -s build_type=Release @@ -52,4 +47,4 @@ jobs: run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp - run: conan atlas create -s build_type=MinSizeRel \ No newline at end of file + run: conan atlas create . -s build_type=MinSizeRel \ No newline at end of file From c448737a51eaf244cd0fa695e8c9ef8d78beefe8 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:31:23 -0800 Subject: [PATCH 18/23] Removed llvm installation from the homebrew command --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 51ad69b..4f18537 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -14,7 +14,7 @@ jobs: - name: Install LLVM run: | - brew install python pipx llvm@20 + brew install python pipx - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.1 From 95c98263f04d5dd5ab892f680ec6634a98d2b791 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:48:08 -0800 Subject: [PATCH 19/23] Updated platform-specific deployment yaml files --- .github/workflows/deploy_linux.yml | 38 +++++++++++---------- .github/workflows/deploy_mac.yml | 30 +++++++++-------- .github/workflows/deploy_windows.yml | 49 ++++++++++++---------------- 3 files changed, 57 insertions(+), 60 deletions(-) diff --git a/.github/workflows/deploy_linux.yml b/.github/workflows/deploy_linux.yml index e777847..81be3e2 100644 --- a/.github/workflows/deploy_linux.yml +++ b/.github/workflows/deploy_linux.yml @@ -1,10 +1,11 @@ name: Deploy to Linux -on: - pull_request: - types: [closed] - branches: - - main # Only trigger for PRs merged into main +# on: +# pull_request: +# types: [closed] +# branches: +# - main # Only trigger for PRs merged into main +on: [workflow_dispatch] jobs: linux_x86_64: @@ -34,33 +35,34 @@ jobs: - name: Pip installing conan shell: pwsh - run: pipx install conan + run: pipx install "conan>=2.18.1" - - name: Setting up conan profiles + - name: Setting up Conan configuration shell: pwsh run: conan config install -sf profiles/x86_64/linux/ -tf profiles https://github.com/engine3d-dev/conan-config.git - - name: Setting up Remote Repositories + - name: Setting up Conan shell: pwsh run: | - conan remote add engine3d-conan https://libhal.jfrog.io/artifactory/api/conan/engine3d-conan - conan remote add libhal-trunk https://libhal.jfrog.io/artifactory/api/conan/trunk-conan + conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup - name: Creating Release build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=Release -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + run: conan atlas create . -s build_type=Release - name: Creating Debug build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=Debug -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=MinSizeRel -pr linux_x86_64 -c tools.system.package_manager:sudo=True -c tools.system.package_manager:mode=install + run: conan atlas create . -s build_type=MinSizeRel - - name: Login to JFrog - run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} + # Uncomment before merging these changes + # - name: Login to JFrog + # run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} - - name: Uploading vulkan-cpp to engine3d-conan remote repositories - shell: pwsh - run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file + # - name: Uploading vulkan-cpp to engine3d-conan remote repositories + # shell: pwsh + # run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml index 50c0f08..7c0e58a 100644 --- a/.github/workflows/deploy_mac.yml +++ b/.github/workflows/deploy_mac.yml @@ -1,10 +1,11 @@ name: Deploy to MacOS Armv8 -on: - pull_request: - types: [closed] - branches: - - main # Only trigger for PRs merged into main +# on: +# pull_request: +# types: [closed] +# branches: +# - main # Only trigger for PRs merged into main +on: [workflow_dispatch] jobs: macos_armv8: @@ -17,7 +18,7 @@ jobs: run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - name: Install LLVM - run: brew install python pipx llvm@20 + run: brew install python pipx - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.1 @@ -44,19 +45,20 @@ jobs: - name: Creating Release build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=Release -pr mac_armv8 + run: conan atlas create . -s build_type=Release - name: Creating Debug build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=Debug -pr mac_armv8 + run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=MinSizeRel -pr mac_armv8 + run: conan atlas create . -s build_type=MinSizeRel - - name: Login to JFrog - run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} + # Uncomment before merging these changes + # - name: Login to JFrog + # run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} - - name: Uploading vulkan-cpp to engine3d-conan remote repositories - shell: pwsh - run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file + # - name: Uploading vulkan-cpp to engine3d-conan remote repositories + # shell: pwsh + # run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file diff --git a/.github/workflows/deploy_windows.yml b/.github/workflows/deploy_windows.yml index 1ab9830..0a20e7f 100644 --- a/.github/workflows/deploy_windows.yml +++ b/.github/workflows/deploy_windows.yml @@ -1,10 +1,11 @@ name: Deploy to Windows -on: - pull_request: - types: [closed] - branches: - - main # Only trigger for PRs merged into main +# on: +# pull_request: +# types: [closed] +# branches: +# - main # Only trigger for PRs merged into main +on: [workflow_dispatch] jobs: windows_x86_64: @@ -16,14 +17,9 @@ jobs: shell: pwsh run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - - name: Install tooling with Choco + - name: Install Git shell: pwsh - run: | - choco install cmake.install --version=3.31.6 - cmake --version - choco install llvm --version=20.1.4 - clang++ --version - choco install git make mingw + run: choco install git - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.1 @@ -37,31 +33,28 @@ jobs: shell: pwsh run: pip install conan - - name: Setting up conan profiles - shell: pwsh - run: conan config install -sf profiles/x86_64/Windows/ -tf profiles https://github.com/engine3d-dev/conan-config.git - - - name: Setting up Remote Repositories + - name: Setting up Conan configuration shell: pwsh run: | - conan remote add engine3d-conan https://libhal.jfrog.io/artifactory/api/conan/engine3d-conan - conan remote add libhal-trunk https://libhal.jfrog.io/artifactory/api/conan/trunk-conan + conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup - - name: Creating Release build for vulkan-cpp + - name: Creating Release build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=Release -pr windows_x86_64 + run: conan atlas create . -s build_type=Release - name: Creating Debug build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=Debug -pr windows_x86_64 + run: conan atlas create . -s build_type=Debug - name: Creating MinSizeRel build for vulkan-cpp shell: pwsh - run: conan create . -b missing -s build_type=MinSizeRel -pr windows_x86_64 + run: conan atlas create . -s build_type=MinSizeRel - - name: Login to JFrog - run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} + # Uncomment before merging these changes + # - name: Login to JFrog + # run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} - - name: Uploading vulkan-cpp to engine3d-conan remote repositories - shell: pwsh - run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file + # - name: Uploading vulkan-cpp to engine3d-conan remote repositories + # shell: pwsh + # run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file From 41c32969f1811efef52038d9cbfe421cacc3729b Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:49:48 -0800 Subject: [PATCH 20/23] Updated platform-specific deployment yaml files --- .github/workflows/deploy_linux.yml | 2 +- .github/workflows/deploy_mac.yml | 2 +- .github/workflows/deploy_windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_linux.yml b/.github/workflows/deploy_linux.yml index 81be3e2..44ffddd 100644 --- a/.github/workflows/deploy_linux.yml +++ b/.github/workflows/deploy_linux.yml @@ -5,7 +5,7 @@ name: Deploy to Linux # types: [closed] # branches: # - main # Only trigger for PRs merged into main -on: [workflow_dispatch] +on: [pull_request, workflow_dispatch] jobs: linux_x86_64: diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml index 7c0e58a..030b7be 100644 --- a/.github/workflows/deploy_mac.yml +++ b/.github/workflows/deploy_mac.yml @@ -5,7 +5,7 @@ name: Deploy to MacOS Armv8 # types: [closed] # branches: # - main # Only trigger for PRs merged into main -on: [workflow_dispatch] +on: [pull_request, workflow_dispatch] jobs: macos_armv8: diff --git a/.github/workflows/deploy_windows.yml b/.github/workflows/deploy_windows.yml index 0a20e7f..148138e 100644 --- a/.github/workflows/deploy_windows.yml +++ b/.github/workflows/deploy_windows.yml @@ -5,7 +5,7 @@ name: Deploy to Windows # types: [closed] # branches: # - main # Only trigger for PRs merged into main -on: [workflow_dispatch] +on: [pull_request, workflow_dispatch] jobs: windows_x86_64: From e780f56a30ceea545f5498b15e3ea811def6d7b6 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:51:15 -0800 Subject: [PATCH 21/23] Updated platform-specific deployment yaml files --- .github/workflows/deploy_linux.yml | 2 +- .github/workflows/deploy_mac.yml | 2 +- .github/workflows/deploy_windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_linux.yml b/.github/workflows/deploy_linux.yml index 44ffddd..4248fe4 100644 --- a/.github/workflows/deploy_linux.yml +++ b/.github/workflows/deploy_linux.yml @@ -9,7 +9,7 @@ on: [pull_request, workflow_dispatch] jobs: linux_x86_64: - if: github.event.pull_request.merged == true + if: github.event.pull_request.merged == false runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml index 030b7be..546e081 100644 --- a/.github/workflows/deploy_mac.yml +++ b/.github/workflows/deploy_mac.yml @@ -9,7 +9,7 @@ on: [pull_request, workflow_dispatch] jobs: macos_armv8: - if: github.event.pull_request.merged == true + if: github.event.pull_request.merged == false runs-on: macos-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/deploy_windows.yml b/.github/workflows/deploy_windows.yml index 148138e..b198e76 100644 --- a/.github/workflows/deploy_windows.yml +++ b/.github/workflows/deploy_windows.yml @@ -9,7 +9,7 @@ on: [pull_request, workflow_dispatch] jobs: windows_x86_64: - if: github.event.pull_request.merged == true + if: github.event.pull_request.merged == false runs-on: windows-latest steps: - uses: actions/checkout@v4 From 75a2cae0c0e07e794e48a1249d84afa02b828ebc Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 01:55:57 -0800 Subject: [PATCH 22/23] Updated deploy_mac.yml --- .github/workflows/deploy_mac.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml index 546e081..b20d711 100644 --- a/.github/workflows/deploy_mac.yml +++ b/.github/workflows/deploy_mac.yml @@ -32,16 +32,12 @@ jobs: run: | pipx install "conan>=2.18.2" pipx upgrade conan - - - name: Setting up conan profiles - shell: pwsh - run: conan config install -sf profiles/armv8/mac/ -tf profiles https://github.com/engine3d-dev/conan-config.git - - - name: Setting up Remote Repositories + + - name: Setting up Conan configuration shell: pwsh run: | - conan remote add engine3d-conan https://libhal.jfrog.io/artifactory/api/conan/engine3d-conan - conan remote add libhal-trunk https://libhal.jfrog.io/artifactory/api/conan/trunk-conan + conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup - name: Creating Release build for vulkan-cpp shell: pwsh From 02770c13f8513447e95438535ebd8d7ad34f1db7 Mon Sep 17 00:00:00 2001 From: SpinnerX Date: Sun, 18 Jan 2026 02:06:31 -0800 Subject: [PATCH 23/23] Finalized changes to the deployment platform yaml files --- .github/workflows/deploy_linux.yml | 24 +++++++++++------------- .github/workflows/deploy_mac.yml | 24 +++++++++++------------- .github/workflows/deploy_windows.yml | 24 +++++++++++------------- 3 files changed, 33 insertions(+), 39 deletions(-) diff --git a/.github/workflows/deploy_linux.yml b/.github/workflows/deploy_linux.yml index 4248fe4..a5d5f70 100644 --- a/.github/workflows/deploy_linux.yml +++ b/.github/workflows/deploy_linux.yml @@ -1,15 +1,14 @@ name: Deploy to Linux -# on: -# pull_request: -# types: [closed] -# branches: -# - main # Only trigger for PRs merged into main -on: [pull_request, workflow_dispatch] +on: + pull_request: + types: [closed] + branches: + - main # Only trigger for PRs merged into main jobs: linux_x86_64: - if: github.event.pull_request.merged == false + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -59,10 +58,9 @@ jobs: shell: pwsh run: conan atlas create . -s build_type=MinSizeRel - # Uncomment before merging these changes - # - name: Login to JFrog - # run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} + - name: Login to JFrog + run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} - # - name: Uploading vulkan-cpp to engine3d-conan remote repositories - # shell: pwsh - # run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file + - name: Uploading vulkan-cpp to engine3d-conan remote repositories + shell: pwsh + run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml index b20d711..c2bd57a 100644 --- a/.github/workflows/deploy_mac.yml +++ b/.github/workflows/deploy_mac.yml @@ -1,15 +1,14 @@ name: Deploy to MacOS Armv8 -# on: -# pull_request: -# types: [closed] -# branches: -# - main # Only trigger for PRs merged into main -on: [pull_request, workflow_dispatch] +on: + pull_request: + types: [closed] + branches: + - main # Only trigger for PRs merged into main jobs: macos_armv8: - if: github.event.pull_request.merged == false + if: github.event.pull_request.merged == true runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -51,10 +50,9 @@ jobs: shell: pwsh run: conan atlas create . -s build_type=MinSizeRel - # Uncomment before merging these changes - # - name: Login to JFrog - # run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} + - name: Login to JFrog + run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} - # - name: Uploading vulkan-cpp to engine3d-conan remote repositories - # shell: pwsh - # run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file + - name: Uploading vulkan-cpp to engine3d-conan remote repositories + shell: pwsh + run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file diff --git a/.github/workflows/deploy_windows.yml b/.github/workflows/deploy_windows.yml index b198e76..a092cff 100644 --- a/.github/workflows/deploy_windows.yml +++ b/.github/workflows/deploy_windows.yml @@ -1,15 +1,14 @@ name: Deploy to Windows -# on: -# pull_request: -# types: [closed] -# branches: -# - main # Only trigger for PRs merged into main -on: [pull_request, workflow_dispatch] +on: + pull_request: + types: [closed] + branches: + - main # Only trigger for PRs merged into main jobs: windows_x86_64: - if: github.event.pull_request.merged == false + if: github.event.pull_request.merged == true runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -51,10 +50,9 @@ jobs: shell: pwsh run: conan atlas create . -s build_type=MinSizeRel - # Uncomment before merging these changes - # - name: Login to JFrog - # run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} + - name: Login to JFrog + run: conan remote login -p ${{ secrets.JFROG_USER_TOKEN_ID }} engine3d-conan ${{ secrets.JFROG_USERNAME }} - # - name: Uploading vulkan-cpp to engine3d-conan remote repositories - # shell: pwsh - # run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file + - name: Uploading vulkan-cpp to engine3d-conan remote repositories + shell: pwsh + run: conan upload vulkan-cpp/4.0 --r=engine3d-conan --confirm \ No newline at end of file