diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index b4551ca..7f6906a 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -18,17 +18,17 @@ jobs: check-formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.4.0 - - uses: actions/cache@v2.1.4 - name: Add Stack files to cache - with: - path: ~/.stack - key: ${{ runner.os }}-stack-formatting - restore-keys: ${{ runner.os }}-stack- + # - uses: actions/cache@v2.1.4 + # name: Add Stack files to cache + # with: + # path: ~/.stack + # key: ${{ runner.os }}-stack-formatting + # restore-keys: ${{ runner.os }}-stack- - - run: stack install fourmolu - name: Install fourmolu + # - run: stack install fourmolu + # name: Install fourmolu - run: ./.github/format.sh name: Run fourmolu @@ -36,32 +36,34 @@ jobs: run-linter: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.4.0 - - uses: actions/cache@v2.1.4 - name: Add Stack files to cache - with: - path: ~/.stack - key: ${{ runner.os }}-stack-lint - restore-keys: ${{ runner.os }}-stack- + # - uses: actions/cache@v2.1.4 + # name: Add Stack files to cache + # with: + # path: ~/.stack + # key: ${{ runner.os }}-stack-lint + # restore-keys: ${{ runner.os }}-stack- - - run: stack install hlint - name: Install hlint + # - run: stack install hlint + # name: Install hlint - - run: ~/.local/bin/hlint $(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs') + # - run: ~/.local/bin/hlint $(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs') + - run: hlint $(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs') name: Run hlint check-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v13 + - uses: actions/checkout@v2.4.0 + - uses: cachix/install-nix-action@v16 name: Set up Nix and IOHK caches with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= substituters = https://hydra.iohk.io https://iohk.cachix.org https://cache.nixos.org/ + experimental-features = nix-command flakes - uses: cachix/cachix-action@v10 with: name: mlabs @@ -76,4 +78,5 @@ jobs: dist-newstyle key: ${{ runner.os }}-cabal - name: Build the project - run: nix build .#check.x86_64-linux --extra-experimental-features nix-command --extra-experimental-features flakes + run: nix build + run: nix flake check diff --git a/test/Spec.hs b/test/Spec.hs index 3aecc52..9cfc14c 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -5,14 +5,9 @@ import Prelude -------------------------------------------------------------------------------- import Test.Tasty (defaultMain, testGroup) -import Test.Tasty.HUnit (assertBool, testCase) -------------------------------------------------------------------------------- main :: IO () main = - defaultMain $ - testGroup - "Suites" - [ testCase "will fail" $ assertBool "false" False - ] + defaultMain $ testGroup "Suites" []