From 0e4dabe8a917f494628ce25dce675e5a1a17cfdc Mon Sep 17 00:00:00 2001 From: Oleksandr Zhabenko <120258924+Oleksandr-Zhabenko@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:23:26 +0300 Subject: [PATCH] Updated configuration files, added a comment to test/AddressSpec.hs file (#55) * Update stack.yaml * Update stack.yaml * Changed yaml files to use string-random-0.1.4.3 * Changed yaml files to use text-2.0.2 * Changed yaml files * Changed yaml files * Changed yaml files * Changed yaml files * Changed yaml files * Changed package.yaml file * Changed yaml files * Added stack-lts-2* yaml files * Changed workflow yaml file * Changed workflow yaml file * Changed workflow yaml file * Changed workflow yaml file * Changed stack.yaml file * Changed stack.yaml file * Changed stack.yaml file * Changed stack.yaml file * Added commentary to test/AddressSpec.hs about the reason of random tests failures * Added commentary to test/AddressSpec.hs about the reason of random tests failures * Changed stack.yaml * Added missed data-files in fakedata.cabal * Accepted changes proposed by psibi * Accepted changes proposed by psibi for stack.yaml * Accepted changes proposed by psibi for stack.yaml * Fixed .github/workflows/tests.yml * Added dist/cabal-config-flags to .gitignore file * Removed unneeded binary files * Removed formatting and the commentary --- .github/workflows/tests.yml | 36 ++++++++++++++++++++++-------------- .gitignore | 5 +++++ fakedata.cabal | 2 +- stack-lts-16.yaml | 8 -------- stack-lts-18.yaml | 14 -------------- stack-lts-20.yaml | 5 +++++ stack-lts-21.yaml | 5 +++++ stack.yaml | 4 +--- test/AddressSpec.hs | 2 +- 9 files changed, 40 insertions(+), 41 deletions(-) delete mode 100644 stack-lts-16.yaml delete mode 100644 stack-lts-18.yaml create mode 100644 stack-lts-20.yaml create mode 100644 stack-lts-21.yaml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f2c9515..17186d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,25 +18,33 @@ jobs: include: - os: ubuntu-latest stack-yaml: stack.yaml - resolver: nightly - - os: ubuntu-latest - stack-yaml: stack.yaml - resolver: lts-18 - - os: ubuntu-latest - stack-yaml: stack-lts-16.yaml - resolver: lts-16 + resolver: lts-22.32 - os: macos-latest stack-yaml: stack.yaml - resolver: nightly - - os: macos-latest + resolver: lts-22.32 + - os: windows-latest stack-yaml: stack.yaml - resolver: lts-18 + resolver: lts-22.32 + - os: ubuntu-latest + stack-yaml: stack-lts-21.yaml + resolver: lts-21.25 + - os: ubuntu-latest + stack-yaml: stack-lts-20.yaml + resolver: lts-20.26 + - os: macos-latest + stack-yaml: stack-lts-21.yaml + resolver: lts-21.25 - os: macos-latest - stack-yaml: stack-lts-16.yaml - resolver: lts-16 + stack-yaml: stack-lts-20.yaml + resolver: lts-20.26 - os: windows-latest - stack-yaml: stack.yaml - resolver: lts-18 + stack-yaml: stack-lts-21.yaml + resolver: lts-21.25 + - os: windows-latest + stack-yaml: stack-lts-20.yaml + resolver: lts-20.26 + + steps: - name: Clone project diff --git a/.gitignore b/.gitignore index 834c089..b6af72c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ .stack-work/ *~ stack.yaml.lock +dist-newstyle/cache/config +cabal.project.local +dist-newstyle/cache/config +dist/cabal-config-flags + diff --git a/fakedata.cabal b/fakedata.cabal index ea68989..abf65ac 100644 --- a/fakedata.cabal +++ b/fakedata.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/stack-lts-16.yaml b/stack-lts-16.yaml deleted file mode 100644 index d5bc63b..0000000 --- a/stack-lts-16.yaml +++ /dev/null @@ -1,8 +0,0 @@ -resolver: lts-16.31 - -packages: -- . - -extra-deps: -- string-random-0.1.2.0@sha256:db4f801dec1ec72cba7d662b9774da60ff54de6d05478e94478d6d730dc5034f,2439 -- fakedata-parser-0.1.0.0 diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml deleted file mode 100644 index 6af6cd2..0000000 --- a/stack-lts-18.yaml +++ /dev/null @@ -1,14 +0,0 @@ -resolver: lts-18.13 - -packages: -- . - --extra-deps: --- yaml-0.11.7.0 --- aeson-2.0.3.0 --- OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262 --- attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810 --- hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005 --- semialign-1.2.0.1@sha256:0e179b4d3a8eff79001d374d6c91917c6221696b9620f0a4d86852fc6a9b9501,2836 --- text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498 --- time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033 diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml new file mode 100644 index 0000000..d1b6878 --- /dev/null +++ b/stack-lts-20.yaml @@ -0,0 +1,5 @@ +resolver: lts-20.26 + +packages: +- . + diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml new file mode 100644 index 0000000..4484070 --- /dev/null +++ b/stack-lts-21.yaml @@ -0,0 +1,5 @@ +resolver: lts-21.25 + +packages: +- . + diff --git a/stack.yaml b/stack.yaml index c00cbf1..f0cb796 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,5 @@ -resolver: lts-19.13 +resolver: lts-22.32 packages: - . -nix: - shell-file: shell.nix diff --git a/test/AddressSpec.hs b/test/AddressSpec.hs index 505620e..11d6f4c 100644 --- a/test/AddressSpec.hs +++ b/test/AddressSpec.hs @@ -68,7 +68,7 @@ spec = do c2 <- country pure (c1, c2) fakeCountry <- generateWithSettings (setNonDeterministic defaultFakerSettings) someCountry - (fst fakeCountry) `shouldNotBe` (snd fakeCountry) + (fst fakeCountry) `shouldNotBe` (snd fakeCountry) it "Equality of sequence" $ do let someCountry :: Fake (Text, Text) someCountry = do