Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .ci/docker/conan-tests
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ENV PY37=3.7.9 \
BAZEL_7=7.6.2 \
BAZEL_8=8.4.2 \
BAZEL_9=9.1.0 \
ZIG=0.16.0 \
EMSDK=4.0.22 \
INTEL_ONEAPI_VERSION=2026.0

Expand Down Expand Up @@ -175,6 +176,11 @@ RUN wget https://github.com/premake/premake-core/releases/download/v5.0.0-beta4/
tar -xvzf premake-5.0.0-beta4-linux.tar.gz && chmod +x premake5 && mkdir /usr/share/premake && \
mv premake5 /usr/share/premake

RUN wget https://ziglang.org/download/$ZIG/zig-x86_64-linux-$ZIG.tar.xz && \
tar -xJf zig-x86_64-linux-$ZIG.tar.xz && \
mv zig-x86_64-linux-$ZIG /usr/share/zig-$ZIG && \
rm zig-x86_64-linux-$ZIG.tar.xz

RUN cd /tmp && \
mkdir qbs && \
cd qbs && \
Expand Down
18 changes: 16 additions & 2 deletions .github/workflows/osx-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ jobs:
~/Applications/bazel/7.6.2
~/Applications/bazel/8.4.2
~/Applications/bazel/9.1.0
key: ${{ runner.os }}-macos26-conan-tools-cache
~/Applications/zig/0.16.0
key: ${{ runner.os }}-macos26-conan-tools-cache-zig0160

- name: Build CMake old versions not available for ARM
if: steps.cache-tools.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -114,6 +115,18 @@ jobs:
chmod +x ${HOME}/Applications/bazel/${version}/bazel
done

- name: Install Zig
if: steps.cache-tools.outputs.cache-hit != 'true'
run: |
set -e
version=0.16.0
wget -q -O zig-${version}.tar.xz https://ziglang.org/download/${version}/zig-aarch64-macos-${version}.tar.xz
tar -xJf zig-${version}.tar.xz
mkdir -p ${HOME}/Applications/zig
mv zig-aarch64-macos-${version} ${HOME}/Applications/zig/${version}
rm zig-${version}.tar.xz
${HOME}/Applications/zig/${version}/zig version

osx_tests:
needs: osx_setup
runs-on: macos-26
Expand Down Expand Up @@ -146,7 +159,8 @@ jobs:
~/Applications/bazel/7.6.2
~/Applications/bazel/8.4.2
~/Applications/bazel/9.1.0
key: ${{ runner.os }}-macos26-conan-tools-cache
~/Applications/zig/0.16.0
key: ${{ runner.os }}-macos26-conan-tools-cache-zig0160

- name: Select Xcode 26.4.1
run: |
Expand Down
21 changes: 20 additions & 1 deletion .github/workflows/win-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ jobs:
C:\tools\bazel\7.6.2
C:\tools\bazel\8.4.2
C:\tools\bazel\9.1.0
key: ${{ runner.os }}-conan-tools-cache
C:\tools\zig\0.16.0
key: ${{ runner.os }}-conan-tools-cache-zig0160

- name: Install CMake versions
if: steps.cache-tools.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -232,6 +233,24 @@ jobs:
Remove-Item $zipFile
}

- name: Install Zig
if: steps.cache-tools.outputs.cache-hit != 'true'
run: |
$version = "0.16.0"
Write-Host "Downloading Zig $version for Windows..."
$url = "https://ziglang.org/download/$version/zig-x86_64-windows-$version.zip"
$zipFile = "zig-$version-windows-x86_64.zip"
$tmpDir = "C:\tools\zig_tmp"
Invoke-WebRequest -Uri $url -OutFile $zipFile
Expand-Archive -Path $zipFile -DestinationPath $tmpDir -Force
if (-not (Test-Path "C:\tools\zig")) {
New-Item -Path "C:\tools\zig" -ItemType Directory | Out-Null
}
Move-Item -Path "$tmpDir\zig-x86_64-windows-$version" -Destination "C:\tools\zig\$version"
Remove-Item $zipFile
Remove-Item -Recurse -Force $tmpDir
& "C:\tools\zig\$version\zig.exe" version

- name: Prepare environment for functional tests
run: |
git config --global core.autocrlf false
Expand Down
3 changes: 2 additions & 1 deletion conan/internal/api/install/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"QbsDeps": "conan.tools.qbs",
"QbsProfile": "conan.tools.qbs",
"CPSDeps": "conan.tools.cps",
"ROSEnv": "conan.tools.ros"
"ROSEnv": "conan.tools.ros",
"ZigDeps": "conan.tools.zig"
}


Expand Down
1 change: 1 addition & 0 deletions conan/tools/zig/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from conan.tools.zig.zigdeps import ZigDeps
Loading
Loading