From ac397f3096e7e5c22b44e1f3fcf5cd7c5e4e3006 Mon Sep 17 00:00:00 2001 From: a5ob7r <12132068+a5ob7r@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:24:22 +0900 Subject: [PATCH] Remove cabal specifications in CI configuration We're not interested in cabal versions. --- .github/workflows/ci.yml | 13 ++++--------- .github/workflows/release.yml | 2 -- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff6b4f3..c01df01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,6 @@ jobs: - '9.6.4' - '9.4.8' - '9.2.8' - cabal: - - '3.10.1.0' steps: - uses: actions/checkout@v4 @@ -31,7 +29,6 @@ jobs: id: setup-haskell with: ghc-version: ${{ matrix.ghc }} - cabal-version: ${{ matrix.cabal }} - name: Freeze dependencies run: cabal freeze @@ -39,9 +36,9 @@ jobs: - uses: actions/cache@v4 with: path: ${{ steps.setup-haskell.outputs.cabal-store }} - key: ci-${{ runner.os }}-${{ matrix.cabal }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} + key: ci-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} restore-keys: | - ci-${{ runner.os }}-${{ matrix.cabal }}-${{ matrix.ghc }}- + ci-${{ runner.os }}-${{ matrix.ghc }}- - name: Add path run: | @@ -84,7 +81,6 @@ jobs: matrix: os: [ubuntu-latest] ghc: ['9.2.8'] - cabal: ['3.10.1.0'] steps: - uses: actions/checkout@v4 @@ -93,14 +89,13 @@ jobs: id: setup-haskell with: ghc-version: ${{ matrix.ghc }} - cabal-version: ${{ matrix.cabal }} - uses: actions/cache@v4 with: path: ${{ steps.setup-haskell.outputs.cabal-store }} - key: format-${{ runner.os }}-${{ matrix.cabal }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project') }} + key: format-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project') }} restore-keys: | - format-${{ runner.os }}-${{ matrix.cabal }}-${{ matrix.ghc }}- + format-${{ runner.os }}-${{ matrix.ghc }}- - name: Install cabal-fmt run: cabal install --overwrite-policy=always -j cabal-fmt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a6ad26..fa39f66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,6 @@ jobs: matrix: os: [ubuntu-latest, macOS-latest] ghc: ['9.2.8'] - cabal: ['3.10.1.0'] steps: - uses: actions/checkout@v4 @@ -21,7 +20,6 @@ jobs: uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} - cabal-version: ${{ matrix.cabal }} - name: Freeze dependencies run: cabal freeze