Skip to content

Commit

Permalink
Pin to version 0.13.0 of Zig
Browse files Browse the repository at this point in the history
Signed-off-by: Ivan Velickovic <[email protected]>
  • Loading branch information
Ivan-Velickovic committed Jun 19, 2024
1 parent b91b504 commit dcfa24a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
run: sudo apt update && sudo apt install -y make clang lld llvm qemu-system-arm device-tree-compiler expect gcc-aarch64-linux-gnu
- name: Install Zig
run: |
wget https://ziglang.org/builds/zig-linux-x86_64-0.13.0-dev.365+332fbb4b0.tar.xz
tar xf zig-linux-x86_64-0.13.0-dev.365+332fbb4b0.tar.xz
echo "${PWD}/zig-linux-x86_64-0.13.0-dev.365+332fbb4b0/:$PATH" >> $GITHUB_PATH
wget https://ziglang.org/builds/zig-linux-x86_64-0.13.0.tar.xz
tar xf zig-linux-x86_64-0.13.0.tar.xz
echo "${PWD}/zig-linux-x86_64-0.13.0/:$PATH" >> $GITHUB_PATH
- name: Install Rust
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
- name: Build and run examples
Expand Down Expand Up @@ -76,9 +76,9 @@ jobs:
echo "/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_PATH
- name: Install Zig
run: |
wget https://ziglang.org/builds/zig-macos-x86_64-0.13.0-dev.365+332fbb4b0.tar.xz
tar xf zig-macos-x86_64-0.13.0-dev.365+332fbb4b0.tar.xz
echo "${PWD}/zig-macos-x86_64-0.13.0-dev.365+332fbb4b0/:$PATH" >> $GITHUB_PATH
wget https://ziglang.org/builds/zig-macos-x86_64-0.13.0.tar.xz
tar xf zig-macos-x86_64-0.13.0.tar.xz
echo "${PWD}/zig-macos-x86_64-0.13.0/:$PATH" >> $GITHUB_PATH
- name: Install Rust
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
- name: Build and run examples
Expand Down
4 changes: 1 addition & 3 deletions examples/simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ system running the whole system.
For educational purposes, you can also build and run this example using the
[Zig](https://ziglang.org/) build system.

At the moment, Zig still under heavy development and hence this example depends
on the 'master' version of Zig for now. This example has been built using
`0.13.0-dev.365+332fbb4b0`, so anything equal to or above that version should work.
This example expects to be built with Zig 0.13.*.

You can download Zig [here](https://ziglang.org/download/).

Expand Down
4 changes: 1 addition & 3 deletions examples/zig/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ the Zig C compiler. Building the example is done via the Zig build system.

## Building the example

At the moment, Zig still under heavy development and hence this example depends
on the 'master' version of Zig for now. This example has been built using
`0.13.0-dev.365+332fbb4b0`, so anything equal to or above that version should work.
This example expects to be built with Zig 0.13.*.

You can download Zig [here](https://ziglang.org/download/).

Expand Down
3 changes: 1 addition & 2 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
let
rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
zig = import (builtins.fetchTarball "https://github.com/mitchellh/zig-overlay/archive/master.tar.gz") {};
pkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
rust = pkgs.rust-bin.fromRustupToolchainFile ./examples/rust/rust-toolchain.toml;
llvm = pkgs.llvmPackages_16;
Expand All @@ -15,7 +14,7 @@ let
in
pkgs.mkShell {
buildInputs = with pkgs.buildPackages; [
zig.master
zig_0_13
rust
qemu
gnumake
Expand Down

0 comments on commit dcfa24a

Please sign in to comment.