From 43542acd36a6a4e379adc815a7aef3738583fed4 Mon Sep 17 00:00:00 2001 From: Rene Schallner Date: Thu, 6 Mar 2025 13:59:39 +0100 Subject: [PATCH] Update flake.nix and GH workflows for zig 0.14.0 --- .github/workflows/build-current-zig.yml | 10 +++++----- .github/workflows/release.yml | 11 +---------- flake.nix | 8 +------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-current-zig.yml b/.github/workflows/build-current-zig.yml index dfb3ce8..0f9bffe 100644 --- a/.github/workflows/build-current-zig.yml +++ b/.github/workflows/build-current-zig.yml @@ -1,5 +1,5 @@ name: Works with Zig 0.13.0 -on: +on: push: branches: - master @@ -7,7 +7,7 @@ on: branches: - master workflow_dispatch: - + jobs: ci: strategy: @@ -18,14 +18,14 @@ jobs: - uses: actions/checkout@v3 - uses: goto-bus-stop/setup-zig@v2 with: - version: 0.13.0 + version: 0.14.0 - name: Check zig version run: zig version - name: Build all examples run: zig build all - # - name: Run all tests - # run: zig build test # Run tests separately so we can see more clearly which one fails + # Also, the test runner tries to run tests concurrently, which causes + # conflicts when port numbers are re-used in the tests - name: Run mustache tests run: zig build test-mustache - name: Run httpparams tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91ad13c..459f99c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ on: jobs: build: runs-on: ubuntu-latest - permissions: + permissions: id-token: write contents: write @@ -25,15 +25,6 @@ jobs: run: | echo "::set-output name=version::${GITHUB_REF#refs/tags/}" - # we don't build pkghash, we provide it in ./tools - # - uses: goto-bus-stop/setup-zig@v2 - # with: - # version: master - # - name: Check zig version - # run: zig version - # - name: Build pkghash tool - # run: zig build pkghash - - name: Generate release notes id: release_notes run: | diff --git a/flake.nix b/flake.nix index 80b9232..9b9d2b2 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ # required for latest zig zig.url = "github:mitchellh/zig-overlay"; - # required for latest neovim - # neovim-flake.url = "github:neovim/neovim?dir=contrib"; - # neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; - # Used for shell.nix flake-compat = { url = github:edolstra/flake-compat; @@ -30,7 +26,6 @@ # Other overlays (final: prev: { zigpkgs = inputs.zig.packages.${prev.system}; - # neovim-nightly-pkgs = inputs.neovim-flake.packages.${prev.system}; }) ]; @@ -43,8 +38,7 @@ in rec { devShells.default = pkgs.mkShell { nativeBuildInputs = with pkgs; [ - # neovim-nightly-pkgs.neovim - zigpkgs."0.13.0" + zigpkgs."0.14.0" bat wrk python3