diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 717dea2..7912916 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,13 +40,8 @@ jobs: with: persist-credentials: false - - name: Install Determinate Nix - uses: DeterminateSystems/determinate-nix-action@d96678350ffd6a456235832eb11e1c491589b7bb # v3.21.8 - with: - extra-conf: lazy-trees = true - - - name: Set up FlakeHub Cache - uses: DeterminateSystems/flakehub-cache-action@77c6bddd7d747943530aaa578c57f233ee5d920e # v3.21.8 + - name: Install Nix + uses: nixbuild/nix-quick-install-action@9f63be77f412a248c9d9a65a4c82cf066cdf8f0c # v35 - name: Install Rust (${{ matrix.toolchain.name }}) uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0 @@ -55,6 +50,8 @@ jobs: - name: Enter Nix Devshell uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1 + with: + arguments: .#ci - name: Workaround MSRV issues if: matrix.toolchain.name == 'msrv' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08fbeb4..b3a4459 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,19 +33,15 @@ jobs: GITHUB_TOKEN: ${{ github.token }} CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }} - - name: Install Determinate Nix + - name: Install Nix if: ${{ steps.release-plz.outputs.prs_created == 'true' || steps.release-plz.outputs.releases_created == 'true' }} - uses: DeterminateSystems/determinate-nix-action@d96678350ffd6a456235832eb11e1c491589b7bb # v3.21.8 - with: - extra-conf: lazy-trees = true - - - name: Set up FlakeHub Cache - if: ${{ steps.release-plz.outputs.prs_created == 'true' || steps.release-plz.outputs.releases_created == 'true' }} - uses: DeterminateSystems/flakehub-cache-action@77c6bddd7d747943530aaa578c57f233ee5d920e # v3.21.8 + uses: nixbuild/nix-quick-install-action@9f63be77f412a248c9d9a65a4c82cf066cdf8f0c # v35 - name: Enter Nix devshell if: ${{ steps.release-plz.outputs.prs_created == 'true' || steps.release-plz.outputs.releases_created == 'true' }} uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1 + with: + arguments: .#ci-release - name: Bump changelog versions if: ${{ steps.release-plz.outputs.prs_created == 'true' }} diff --git a/flake.nix b/flake.nix index 8cebdfe..81d365a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,15 @@ perSystem = { pkgs, config, inputs', system, lib, ... }: { formatter = pkgs.nixpkgs-fmt; + devShells.ci = pkgs.mkShell { + packages = [ pkgs.cargo-nextest pkgs.just ]; + shellHook = config.x52.justRust.shellHook; + }; + + devShells.ci-release = pkgs.mkShell { + packages = [ inputs'.x52.packages.x52-release-tools ]; + }; + devShells.default = pkgs.mkShell { packages = [ config.formatter