From d7bdb994bd9b1902feb427373ddf70c82c01d5ff Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 15:27:01 +0300 Subject: [PATCH 1/8] Add GHC 9.4 to CI --- .github/workflows/haskell-ci.yml | 9 +++++++-- package.yaml | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ab9140d..09b7447 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -32,9 +32,14 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.2.2 + - compiler: ghc-9.4.4 compilerKind: ghc - compilerVersion: 9.2.2 + compilerVersion: 9.4.4 + setup-method: ghcup + allow-failure: true + - compiler: ghc-9.2.5 + compilerKind: ghc + compilerVersion: 9.2.5 setup-method: ghcup allow-failure: true - compiler: ghc-9.0.2 diff --git a/package.yaml b/package.yaml index 21dd9d0..9fc9363 100644 --- a/package.yaml +++ b/package.yaml @@ -22,7 +22,8 @@ extra-source-files: tested-with: | GHC ==8.10.7 || ==9.0.2 - || ==9.2.2 + || ==9.2.5 + || ==9.4.4 # Metadata used when publishing your package From cc2dee51541c2d803fe7df273c4ee66eed73c465 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 15:38:24 +0300 Subject: [PATCH 2/8] Update dependencies for 9.4 --- package.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.yaml b/package.yaml index 9fc9363..91e54b3 100644 --- a/package.yaml +++ b/package.yaml @@ -45,10 +45,10 @@ dependencies: - filepath - http-conduit >= 2.3 && < 2.4 - hyraxAbif >= 0.2.3.27 && < 0.2.4.0 -- lens >= 4.16 && < 5.2 -- linear >= 1.20 && < 1.22 +- lens >= 4.16 && < 5.3 +- linear >= 1.20 && < 1.23 - megaparsec >= 9.0.1 -- mtl >= 2.2.1 && < 2.3.0 +- mtl >= 2.2.1 && < 2.4 - parser-combinators >= 1.2.1 - split - text >= 1.2.2.1 && < 2.1 From 631301d950f25492f8c2b8cdc4c071396a909a4f Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 17:47:03 +0300 Subject: [PATCH 3/8] Try haskell-ci 0.15 --- .github/workflows/haskell-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 09b7447..35e691f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.14.3 +# version: 0.15.20230115 # -# REGENDATA ("0.14.3",["github","cobot-io.cabal"]) +# REGENDATA ("0.15.20230115",["github","cobot-io.cabal"]) # name: Haskell-CI on: @@ -23,7 +23,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 60 container: @@ -59,10 +59,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" - "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -137,18 +137,18 @@ jobs: - name: install hpack run: | curl -sL https://github.com/sol/hpack/releases/download/0.34.2/hpack_linux.gz > hpack_linux.gz + echo 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 hpack_linux.gz' | sha256sum -c - gzip -d < hpack_linux.gz > $HOME/.cabal/bin/hpack rm -f hpack_linux.gz chmod a+x $HOME/.cabal/bin/hpack hpack --version - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: source - - name: generate cabal file + - name: generate cabal from package.yaml run: | - cd $GITHUB_WORKSPACE/source - hpack + (cd ${PKGDIR_cobot_io} && if [ -e package.yaml ]; then hpack; fi) - name: initial cabal.project for sdist run: | touch cabal.project @@ -186,7 +186,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -210,7 +210,7 @@ jobs: ${CABAL} -vnormal check - name: haddock run: | - $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all - name: unconstrained build run: | rm -f cabal.project.local From a41790dcec2ae22b4ed0309499eea43ac80ab417 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 18:03:34 +0300 Subject: [PATCH 4/8] dbeug --- .github/workflows/haskell-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 35e691f..2d1db3e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -137,6 +137,8 @@ jobs: - name: install hpack run: | curl -sL https://github.com/sol/hpack/releases/download/0.34.2/hpack_linux.gz > hpack_linux.gz + sha256sum hpack_linux.gz + file hpack_linux.gz echo 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 hpack_linux.gz' | sha256sum -c - gzip -d < hpack_linux.gz > $HOME/.cabal/bin/hpack rm -f hpack_linux.gz From 18c7ccb36882194c31f14471205210ee27588dfa Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 18:07:46 +0300 Subject: [PATCH 5/8] fix --- .github/workflows/haskell-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 2d1db3e..c576604 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -139,7 +139,7 @@ jobs: curl -sL https://github.com/sol/hpack/releases/download/0.34.2/hpack_linux.gz > hpack_linux.gz sha256sum hpack_linux.gz file hpack_linux.gz - echo 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 hpack_linux.gz' | sha256sum -c - + echo '39cec7b69b913d832738244433b39f65ca797d9d99cfcda22650380262ef7604 hpack_linux.gz' | sha256sum -c - gzip -d < hpack_linux.gz > $HOME/.cabal/bin/hpack rm -f hpack_linux.gz chmod a+x $HOME/.cabal/bin/hpack From 758f3c3ce8135db63451198a9ff73af6eaa1de02 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 18:11:31 +0300 Subject: [PATCH 6/8] more debug --- .github/workflows/haskell-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index c576604..009164f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -150,6 +150,8 @@ jobs: path: source - name: generate cabal from package.yaml run: | + echo ${PKGDIR_cobot_io} + ls -l ${PKGDIR_cobot_io} (cd ${PKGDIR_cobot_io} && if [ -e package.yaml ]; then hpack; fi) - name: initial cabal.project for sdist run: | From a25a9dc2eec47ad7aea627afbf6093a36af26b99 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 18:17:14 +0300 Subject: [PATCH 7/8] debug --- .github/workflows/haskell-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 009164f..420efd7 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -137,8 +137,6 @@ jobs: - name: install hpack run: | curl -sL https://github.com/sol/hpack/releases/download/0.34.2/hpack_linux.gz > hpack_linux.gz - sha256sum hpack_linux.gz - file hpack_linux.gz echo '39cec7b69b913d832738244433b39f65ca797d9d99cfcda22650380262ef7604 hpack_linux.gz' | sha256sum -c - gzip -d < hpack_linux.gz > $HOME/.cabal/bin/hpack rm -f hpack_linux.gz @@ -150,8 +148,8 @@ jobs: path: source - name: generate cabal from package.yaml run: | - echo ${PKGDIR_cobot_io} - ls -l ${PKGDIR_cobot_io} + PKGDIR_cobot_io="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cobot-io-[0-9.]*')" + echo "PKGDIR_cobot_io=${PKGDIR_cobot_io}" >> "$GITHUB_ENV" (cd ${PKGDIR_cobot_io} && if [ -e package.yaml ]; then hpack; fi) - name: initial cabal.project for sdist run: | @@ -168,8 +166,6 @@ jobs: find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; - name: generate cabal.project run: | - PKGDIR_cobot_io="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cobot-io-[0-9.]*')" - echo "PKGDIR_cobot_io=${PKGDIR_cobot_io}" >> "$GITHUB_ENV" rm -f cabal.project cabal.project.local touch cabal.project touch cabal.project.local From 7dc65084f33993daaabfce8e0163ba340d197930 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 17 Jan 2023 18:28:25 +0300 Subject: [PATCH 8/8] debug --- .github/workflows/haskell-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 420efd7..cf8897e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -148,9 +148,8 @@ jobs: path: source - name: generate cabal from package.yaml run: | - PKGDIR_cobot_io="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cobot-io-[0-9.]*')" - echo "PKGDIR_cobot_io=${PKGDIR_cobot_io}" >> "$GITHUB_ENV" - (cd ${PKGDIR_cobot_io} && if [ -e package.yaml ]; then hpack; fi) + PKGDIR_cobot_io_original="$(find "$GITHUB_WORKSPACE/source" -maxdepth 1 -type d -regex '.*/cobot-io-[0-9.]*')" + (cd ${PKGDIR_cobot_io_original} && if [ -e package.yaml ]; then hpack; fi) - name: initial cabal.project for sdist run: | touch cabal.project