diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 311d113..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: 2 -updates: - - # Maintain dependencies for GitHub Actions - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" \ No newline at end of file diff --git a/.github/workflows/ci.dhall b/.github/workflows/ci.dhall index eca441d..be5f523 100644 --- a/.github/workflows/ci.dhall +++ b/.github/workflows/ci.dhall @@ -4,7 +4,14 @@ let haskellCi = let defSteps = haskellCi.defaultCabalSteps in haskellCi.generalCi - (haskellCi.withNix defSteps) + ( haskellCi.withNix + ( defSteps + with extraSteps.pre + = + defSteps.extraSteps.pre + # [ haskellCi.installCachixStep "hnix-store" ] + ) + ) haskellCi.DhallMatrix::{ , ghc = [ haskellCi.GHC.GHC963 diff --git a/.github/workflows/ci.dhall.frozen b/.github/workflows/ci.dhall.frozen index 1838cd8..bd803e1 100644 --- a/.github/workflows/ci.dhall.frozen +++ b/.github/workflows/ci.dhall.frozen @@ -1,11 +1,18 @@ let haskellCi = https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall - sha256:9e49c0d57a38ab766825b3d2de6656d998b15eec873982db97d590ef58298601 + sha256:5d7058a7684fd5315467b562853bd1c4a43da691c09293d3715ee739dfa26e08 let defSteps = haskellCi.defaultCabalSteps in haskellCi.generalCi - (haskellCi.withNix defSteps) + ( haskellCi.withNix + ( defSteps + with extraSteps.pre + = + defSteps.extraSteps.pre + # [ haskellCi.installCachixStep "hnix-store" ] + ) + ) haskellCi.DhallMatrix::{ , ghc = [ haskellCi.GHC.GHC963 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bd59848..78d1068 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,9 +4,13 @@ jobs: name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}" "runs-on": "${{ matrix.os }}" steps: - - uses: "cachix/install-nix-action@v23" + - uses: "cachix/install-nix-action@v24" with: nix_path: "nixpkgs=channel:nixos-unstable" + - uses: "cachix/cachix-action@v13" + with: + name: "hnix-store" + signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}" - uses: "actions/checkout@v4" with: submodules: recursive diff --git a/cabal.project b/cabal.project index dd0a4d2..e3b67e9 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,6 @@ +test: true +benchmarks: true + packages: ./hnix-store-core/hnix-store-core.cabal ./hnix-store-db/hnix-store-db.cabal diff --git a/cabal.project.local.ci b/cabal.project.local.ci index 274e14f..d97bf7d 100644 --- a/cabal.project.local.ci +++ b/cabal.project.local.ci @@ -1,5 +1,3 @@ -tests: True - package hnix-store-core ghc-options: -Wunused-packages -Wall -Werror