diff --git a/.github/workflows/test.yml b/.github/workflows/test-develop-classic.yml similarity index 50% rename from .github/workflows/test.yml rename to .github/workflows/test-develop-classic.yml index 44c6488..0455e30 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test-develop-classic.yml @@ -1,4 +1,4 @@ -name: "Test" +name: "Development workflow - nix-shell" on: pull_request: push: @@ -13,5 +13,9 @@ jobs: steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - - name: build - run: NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz nix-build --expr '(import { }).callPackage ./. { }' + with: + nix_path: nixpkgs=channel:nixos-unstable + - name: Build + run: nix-shell --run 'meson build && cd build && ninja' + - name: Run tests + run: nix-shell --run 'pytest ./tests' diff --git a/.github/workflows/test-flakes.yml b/.github/workflows/test-develop-flakes.yml similarity index 60% rename from .github/workflows/test-flakes.yml rename to .github/workflows/test-develop-flakes.yml index ea6de78..b4c0afa 100644 --- a/.github/workflows/test-flakes.yml +++ b/.github/workflows/test-develop-flakes.yml @@ -1,4 +1,4 @@ -name: "Flake test" +name: "Development workflow - flakes" on: pull_request: push: @@ -16,11 +16,7 @@ jobs: # Nix Flakes doesn't work on shallow clones fetch-depth: 0 - uses: cachix/install-nix-action@v16 - - name: List flake structure - run: nix flake show - name: Build - run: nix build --out-link result + run: nix develop -c bash -c 'meson build && cd build && ninja' - name: Run tests - run: | - nix develop -c install -D ./result/bin/nix-eval-jobs ./build/src/nix-eval-jobs - nix develop -c pytest ./tests + run: nix develop -c pytest ./tests