diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6294a3..b563960 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,15 +18,15 @@ jobs: fail-fast: true matrix: os: - # - macos-13 # Intel - # - macos-14 # ARM + - macos-13 # Intel + - macos-14 # ARM - ubuntu-latest devShell: - ghc810 - # - ghc90 - # exclude: - # - os: macos-14 # ARM - # devShell: ghc810 + - ghc90 + exclude: + - os: macos-14 # ARM + devShell: ghc810 runs-on: ${{ matrix.os }} @@ -48,25 +48,21 @@ jobs: key: ${{ runner.os }}-${{ matrix.devShell }}-${{ hashFiles('*.cabal') }} restore-keys: ${{ runner.os }}-${{ matrix.devShell }}- - name: Install packages / Print versions - # run: ./bin/${{ matrix.devShell }} -c ghc --version && cabal --version - run: | - ./bin/${{ matrix.devShell }} -c which cabal - ./bin/${{ matrix.devShell }} -c cabal --version - # - name: Update package index - # run: ./bin/${{ matrix.devShell }} -c cabal update - # - name: Enable tests - # run: ./bin/${{ matrix.devShell }} -c cabal configure --enable-tests - # - name: Install project dependencies - # run: ./bin/${{ matrix.devShell }} -c cabal build --only-dependencies - # - name: Compile project - # run: ./bin/${{ matrix.devShell }} -c cabal build - # - name: Run tests - # run: ./bin/${{ matrix.devShell }} -c cabal test - # - name: Check documentation - # run: ./bin/${{ matrix.devShell }} -c ./script/haddock + run: ./bin/${{ matrix.devShell }} -c ghc --version && cabal --version + - name: Update package index + run: ./bin/${{ matrix.devShell }} -c cabal update + - name: Enable tests + run: ./bin/${{ matrix.devShell }} -c cabal configure --enable-tests + - name: Install project dependencies + run: ./bin/${{ matrix.devShell }} -c cabal build --only-dependencies + - name: Compile project + run: ./bin/${{ matrix.devShell }} -c cabal build + - name: Run tests + run: ./bin/${{ matrix.devShell }} -c cabal test + - name: Check documentation + run: ./bin/${{ matrix.devShell }} -c ./script/haddock docker: - if: false uses: ./.github/workflows/reusable-docker.yml with: push: false diff --git a/shell.nix b/shell.nix index 210495f..0f7220a 100644 --- a/shell.nix +++ b/shell.nix @@ -13,7 +13,7 @@ in pkgs.mkShell { buildInputs = [ pkgs.haskellPackages.cabal-install - # pkgs.zsh - # supportedGhcVersions.${ghcVersion} + pkgs.zsh + supportedGhcVersions.${ghcVersion} ]; }