diff --git a/.github/workflows/ci_cross_compile.yml b/.github/workflows/ci_cross_compile.yml index a6348eb2c2..66c74a105d 100644 --- a/.github/workflows/ci_cross_compile.yml +++ b/.github/workflows/ci_cross_compile.yml @@ -31,7 +31,7 @@ jobs: - uses: mlugg/setup-zig@8d6198c65fb0feaa111df26e6b467fea8345e46f # 2.0.5 with: - version: 0.15.1 + version: 0.15.2 use-cache: false - name: Setup MSVC (Windows) diff --git a/.github/workflows/ci_zig.yml b/.github/workflows/ci_zig.yml index 1d29e29fb1..4b8913d472 100644 --- a/.github/workflows/ci_zig.yml +++ b/.github/workflows/ci_zig.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4 - uses: mlugg/setup-zig@8d6198c65fb0feaa111df26e6b467fea8345e46f # ratchet:mlugg/setup-zig@v2.0.5 with: - version: 0.15.1 + version: 0.15.2 use-cache: true - name: zig lints @@ -84,7 +84,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4 - uses: mlugg/setup-zig@8d6198c65fb0feaa111df26e6b467fea8345e46f # ratchet:mlugg/setup-zig@v2.0.5 with: - version: 0.15.1 + version: 0.15.2 use-cache: true - if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos') uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # ratchet:cachix/install-nix-action@v31 @@ -226,7 +226,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4 - uses: mlugg/setup-zig@8d6198c65fb0feaa111df26e6b467fea8345e46f # ratchet:mlugg/setup-zig@v2.0.5 with: - version: 0.15.1 + version: 0.15.2 use-cache: true - name: cross compile with llvm diff --git a/src/README.md b/src/README.md index da86edb389..0d07a46280 100644 --- a/src/README.md +++ b/src/README.md @@ -52,7 +52,7 @@ Try it with `zig build -Dno-bin -fincremental --watch` ### Expanding to ZLS This fast config can also be used with `zls`. Simply follow these steps: -1. run `zls --version` and make sure it is `0.15.0` (this is still used for zig `0.15.1`). +1. run `zls --version` and make sure it is `0.15.0` (this is still used for zig `0.15.2`). 2. run `zls env` and grab the `config_file` path. 3. Edit the config file to include ```json diff --git a/src/flake.lock b/src/flake.lock index 90418c8817..5b83b57293 100644 --- a/src/flake.lock +++ b/src/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": {