diff --git a/.github/workflows/deploy_linux.yml b/.github/workflows/deploy_linux.yml index e777847..a5d5f70 100644 --- a/.github/workflows/deploy_linux.yml +++ b/.github/workflows/deploy_linux.yml @@ -34,29 +34,29 @@ 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 }} diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml index 50c0f08..c2bd57a 100644 --- a/.github/workflows/deploy_mac.yml +++ b/.github/workflows/deploy_mac.yml @@ -17,7 +17,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 @@ -31,28 +31,24 @@ 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 - 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 }} diff --git a/.github/workflows/deploy_windows.yml b/.github/workflows/deploy_windows.yml index 1ab9830..a092cff 100644 --- a/.github/workflows/deploy_windows.yml +++ b/.github/workflows/deploy_windows.yml @@ -16,14 +16,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,27 +32,23 @@ 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 }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index eb1a7bd..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 @@ -37,20 +34,17 @@ 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 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 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 diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 46dfba8..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 @@ -35,16 +35,16 @@ jobs: - name: Install Rosetta 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 - - - name: Installing Atlas repositories + - name: Setting up Conan configuration 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 - 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 + - 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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 269443a..864d1ef 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,45 +13,35 @@ 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 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: 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 + - name: Setting up Conan configuration shell: pwsh - run: conan config install -sf profiles/x86_64/Windows/ -tf profiles https://github.com/engine3d-dev/conan-config.git + run: | + conan config install https://github.com/engine3d-dev/conan-config.git + conan atlas setup - - name: Setting up packages + - name: Creating Release build for vulkan-cpp 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 + run: conan atlas create . -s build_type=Release - - name: Building vulkan-cpp + - name: Creating Debug build for 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 + run: conan atlas create . -s build_type=Debug + + - name: Creating MinSizeRel build for vulkan-cpp + shell: pwsh + run: conan atlas create . -s build_type=MinSizeRel \ No newline at end of file