From a7b8e56d29a1e27dfeee371b4934b6f8ba191920 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Sun, 24 Nov 2024 21:20:30 -0500 Subject: [PATCH 1/4] Run CI on macOS --- .github/workflows/nix.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 2db6620..4d5f303 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 From d878935c2e82fc69d59653714239c8b9bfa309b6 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Sun, 24 Nov 2024 21:21:23 -0500 Subject: [PATCH 2/4] Update drv version --- nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 01393b21c0988c7be556601d5ea560e4b4d83fbb Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Sun, 24 Nov 2024 22:47:57 -0500 Subject: [PATCH 3/4] Disable spec test on macOS --- .github/workflows/nix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 4d5f303..3ee634c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -27,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 From 5e74aaf9db3b67d30aa0f9dbf1a83e16854ac3d2 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Sun, 24 Nov 2024 23:41:28 -0500 Subject: [PATCH 4/4] Disable docker test in toml --- nvfetcher_example.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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"]