diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 2db6620..3ee634c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -5,10 +5,15 @@ on: branches: [master] jobs: nix-tests: - runs-on: ubuntu-latest + strategy: + matrix: + os: + - ubuntu-latest + - macos-latest + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v25 + - uses: cachix/install-nix-action@v27 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} nix_path: nixpkgs=channel:nixos-unstable @@ -22,6 +27,7 @@ jobs: cp -r ./result-doc/share/doc/nvfetcher-*/html/ docs - name: Run spec tests + if: ${{ matrix.os != 'macos-latest' }} run: | nix develop --command cabal update nix develop --command cabal test diff --git a/nix/default.nix b/nix/default.nix index 5928fe3..288794f 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { pname = "nvfetcher"; - version = "0.6.2.0"; + version = "0.7.0.0"; src = ../.; isLibrary = true; isExecutable = true; diff --git a/nvfetcher_example.toml b/nvfetcher_example.toml index 691245f..e869639 100644 --- a/nvfetcher_example.toml +++ b/nvfetcher_example.toml @@ -52,10 +52,10 @@ fetch.github = "lilydjwg/nvchecker" src.git = "https://github.com/NixOS/nixpkgs" fetch.tarball = "https://github.com/nixos/nixpkgs/archive/$ver.tar.gz" -[alpine] -src.container = "library/alpine" -src.include_regex = "3\\..*" -fetch.docker = "library/alpine" +# [alpine] +# src.container = "library/alpine" +# src.include_regex = "3\\..*" +# fetch.docker = "library/alpine" # To demonstrate package key containing `.` ["submodule.example"]