diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63bb54b..fd7f967 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,9 @@ jobs: strategy: matrix: stack-yaml: - - stack-nightly.yaml # ghc-9.6 + hoauth2-2.9.0 - - stack.yaml # ghc-9.4 + - stack-nightly.yaml # ghc-9.8 + - stack.yaml # ghc-9.6 + - stack-lts-21.25.yaml # ghc-9.4 - stack-lts-20.26.yaml # ghc-9.2 - stack-lts-19.33.yaml # ghc-9.0 - stack-lts-18.28.yaml # ghc-8.10 @@ -30,17 +31,17 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v3 - - uses: freckle/stack-action@v4 + - uses: actions/checkout@v4 + - uses: freckle/stack-action@v5 with: stack-yaml: ${{ matrix.stack-yaml }} - stack-arguments: --flag yesod-auth-oauth2:example + stack-build-arguments: --flag yesod-auth-oauth2:example lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: haskell/actions/hlint-setup@v2 - - uses: haskell/actions/hlint-run@v2 + - uses: actions/checkout@v4 + - uses: haskell-actions/hlint-setup@v2 + - uses: haskell-actions/hlint-run@v2 with: fail-on: warning diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 528eb0b..33acda8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,16 +8,15 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - id: tag - uses: freckle/haskell-tag-action@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: freckle/haskell-tag-action@v1 - if: steps.tag.outputs.tag - uses: freckle/stack-upload-action@main - with: - pvp-bounds: lower + run: stack upload --pvp-bounds lower env: - HACKAGE_API_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }} + HACKAGE_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }} + + # Use minimum LTS to set lowest lower bounds + STACK_YAML: stack-lts-14.27.yaml diff --git a/stack-lts-21.25.yaml b/stack-lts-21.25.yaml new file mode 100644 index 0000000..377040a --- /dev/null +++ b/stack-lts-21.25.yaml @@ -0,0 +1 @@ +resolver: lts-21.25 diff --git a/stack-lts-21.25.yaml.lock b/stack-lts-21.25.yaml.lock new file mode 100644 index 0000000..f823d29 --- /dev/null +++ b/stack-lts-21.25.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd + size: 640086 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml + original: lts-21.25 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 078b788..9ca461a 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,3 +1,12 @@ -resolver: nightly-2023-10-30 +resolver: nightly-2024-02-27 extra-deps: - - hoauth2-2.9.0 + - yesod-auth-1.6.11.2 + + # For yesod-auth + - email-validate-2.3.2.19 + - yesod-form-1.7.6 + - yesod-1.6.2.1 + +allow-newer: true +allow-newer-deps: + - email-validate diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock index 5d04eb7..71e3a81 100644 --- a/stack-nightly.yaml.lock +++ b/stack-nightly.yaml.lock @@ -5,15 +5,36 @@ packages: - completed: - hackage: hoauth2-2.9.0@sha256:b12385374771dd2d134cb88234aa80c4ab381ff0c491870a3be5f2676c3fade6,3529 + hackage: yesod-auth-1.6.11.2@sha256:c580afaccc311ad90fc8a90210b5cf998d95350ddffb622e45282d9b640cf519,3108 pantry-tree: - sha256: 33a8b924018c8c2d7b08dfbd16ec00e6f645ab9d5c653a0e335132936641bc82 - size: 2129 + sha256: 58e36ca675fc01109915342d4df9cb2680fd37ff20919d84694cdd1d52eb7dc3 + size: 1013 original: - hackage: hoauth2-2.9.0 + hackage: yesod-auth-1.6.11.2 +- completed: + hackage: email-validate-2.3.2.19@sha256:206a835fe99a79f2360c576e3594d8add82d2f1e001d58b49a60f60233da2bf5,1380 + pantry-tree: + sha256: 391475ca7c84d59b1d8de362856acd2f56321d29d54ffcd05ed2a170d4e62692 + size: 419 + original: + hackage: email-validate-2.3.2.19 +- completed: + hackage: yesod-form-1.7.6@sha256:42219f2c4feaa2de32280c0b8f98db818f993152693a79960808fd3001a4c0e2,3434 + pantry-tree: + sha256: 8a48fc861796a61cf6abd2087fedd86844ba5c3e11c89c74d2d04c4656d69997 + size: 1797 + original: + hackage: yesod-form-1.7.6 +- completed: + hackage: yesod-1.6.2.1@sha256:504bc888257dae9bb40f4cd1e1110c4e80dfe7b867e8e207b22c4ca4dbd87f9a,2030 + pantry-tree: + sha256: 5a78fa0c6e7dcb46c9acd687ab9409c8fcda0d59b930e2a93e5dc44128c740ec + size: 618 + original: + hackage: yesod-1.6.2.1 snapshots: - completed: - sha256: e1e4b585723b266822e37cf602d87b57c7c8774b7e5f6b84fdcc580ea5eb2bf1 - size: 697668 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/10/30.yaml - original: nightly-2023-10-30 + sha256: e596f5467d31095fd7b9f750e82aeffe012e38e795c13e1cdc945c9cab928085 + size: 604415 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/2/27.yaml + original: nightly-2024-02-27 diff --git a/stack.yaml b/stack.yaml index c7f72d1..6b01367 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: lts-21.5 +resolver: lts-22.12 diff --git a/stack.yaml.lock b/stack.yaml.lock index 8b6e093..7fb5a12 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: 1d5fb7e344e76dd2c8958e3061d4e4dabb50a1355e6ff02e7d0e4f754c0adf47 - size: 640015 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/5.yaml - original: lts-21.5 + sha256: e2c529ccfb21501f98f639e056cbde50470b86256d9849d7a82d414ca23e4276 + size: 712898 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/12.yaml + original: lts-22.12