From 24af42db71d6020069fdc42afd41020180eff432 Mon Sep 17 00:00:00 2001 From: Gregory Gerasev Date: Sat, 27 Apr 2024 17:49:47 +0700 Subject: [PATCH] Fixup CI working --- .envrc | 2 +- .github/workflows/haskell-ci.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.envrc b/.envrc index d66daa8..37d02de 100644 --- a/.envrc +++ b/.envrc @@ -3,4 +3,4 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=" fi # https://github.com/input-output-hk/devx Slightly opinionated shared GitHub Action for Cardano-Haskell projects -use flake "github:input-output-hk/devx#ghc963-iog" +use flake "github:input-output-hk/devx#ghc964-iog" diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 90692bc..d9492d4 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,6 +1,6 @@ name: Haskell-CI on: - - push + - pull_request jobs: tests: runs-on: ubuntu-latest @@ -31,8 +31,8 @@ jobs: ~/.cabal/packages ~/.cabal/store dist-newstyle - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }} - restore-keys: ${{ runner.os }}-${{ matrix.ghc }}- + key: ${{ runner.os }}-ghc964-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }} + restore-keys: ${{ runner.os }}-ghc964- - name: Cabal build and test shell: devx {0} run: | @@ -44,5 +44,5 @@ jobs: run: | cabal install cabal-fmt cabal install fourmolu - cabal-fmt --check cem-script.cabal - fourmolu . + /home/runner/.cabal-devx/bin/cabal-fmt --check cem-script.cabal + /home/runner/.cabal-devx/bin/fourmolu .