diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ba68b1..8f99aee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,25 @@ jobs: ormolu: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: mrkkrp/ormolu-action@v6 + + hlint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: 'Set up HLint' + uses: haskell/actions/hlint-setup@v2 + with: + version: '3.4' + + - name: 'Run HLint' + uses: haskell/actions/hlint-run@v2 + with: + path: '["src/", "test/", "examples"]' + fail-on: warning + cabal: name: ${{ matrix.os }} / ghc-${{ matrix.ghc }} / cabal-${{ matrix.cabal }} runs-on: ${{ matrix.os }} @@ -50,10 +67,10 @@ jobs: # ghc: 8.6.5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: haskell/actions/setup@v1 + - uses: haskell/actions/setup@v2 id: setup-haskell-cabal name: Setup Haskell with: @@ -68,11 +85,15 @@ jobs: run: | cabal freeze - - uses: actions/cache@v2.1.3 - name: Cache ~/.cabal/store + - uses: actions/cache@v3 + name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle with: - path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} + path: | + ~/.cabal/packages + ~/.cabal/store + dist-newstyle + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }} + restore-keys: ${{ runner.os }}-${{ matrix.ghc }}- - name: Install dependencies run: | @@ -128,7 +149,6 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - stack: ["2.7.3"] ghc: - "8.10.7" - "9.0.2" @@ -139,18 +159,27 @@ jobs: - uses: actions/checkout@v2 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: haskell/actions/setup@v1 + - uses: haskell/actions/setup@v2 name: Setup Haskell Stack with: enable-stack: true ghc-version: ${{ matrix.ghc }} - stack-version: ${{ matrix.stack }} + stack-version: 'latest' - - uses: actions/cache@v2.1.3 + - uses: actions/cache@v3 name: Cache ~/.stack with: path: ~/.stack - key: ${{ runner.os }}-${{ matrix.ghc }}-stack + key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }} + restore-keys: | + ${{ runner.os }}-stack-global- + - uses: actions/cache@v3 + name: Cache .stack-work + with: + path: .stack-work + key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}-${{ hashFiles('**/*.hs') }} + restore-keys: | + ${{ runner.os }}-stack-work- - name: Install dependencies run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fb715c..49da420 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ Changelog ========== +## Version 1.6.0 + +* HLint fixes - some types were changed to newtype (#173) +* Fix XML generation test for S3 SELECT (#161) +* Use region specific endpoints for AWS S3 in presigned Urls (#164) +* Replace protolude with relude and build with GHC 9.0.2 (#168) +* Support aeson 2 (#169) +* CI updates and code formatting changes with ormolu 0.5.0.0 + ## Version 1.5.3 * Fix windows build diff --git a/minio-hs.cabal b/minio-hs.cabal index 14a38d3..4318367 100644 --- a/minio-hs.cabal +++ b/minio-hs.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: minio-hs -version: 1.5.3 +version: 1.6.0 synopsis: A MinIO Haskell Library for Amazon S3 compatible cloud storage. description: The MinIO Haskell client library provides simple APIs to