diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c563074..6de72fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,8 @@ stages: - checks + - quick-test - test + - expensive-test - release variables: @@ -242,21 +244,21 @@ test:linux:stack: ######## bootstrap test ######## test:linux:bootstrap_script: - stage: test + stage: quick-test before_script: - ./.gitlab/before_script/linux/install_deps_minimal.sh script: - ./.gitlab/script/ghcup_bootstrap.sh variables: - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" extends: - .debian - .root_cleanup needs: [] test:windows:bootstrap_powershell_script: - stage: test + stage: quick-test script: - ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir $CI_PROJECT_DIR -BootstrapUrl $CI_PROJECT_DIR/bootstrap-haskell -InBash after_script: @@ -265,8 +267,8 @@ test:windows:bootstrap_powershell_script: - "[Environment]::SetEnvironmentVariable('CABAL_DIR', $null, [System.EnvironmentVariableTarget]::User)" - bash ./.gitlab/after_script.sh variables: - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" extends: - .windows needs: [] @@ -277,19 +279,19 @@ test:linux: stage: test extends: .test_ghcup_version:linux variables: - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" needs: [] test:linux:hls: - stage: test + stage: expensive-test extends: - .test_ghcup_version - .debian variables: GHC_VERSION: "8.10.7" HLS_TARGET_VERSION: "1.4.0" - CABAL_VERSION: "3.6.0.0" + CABAL_VERSION: "3.6.2.0" needs: [] when: manual allow_failure: true @@ -299,14 +301,14 @@ test:linux:hls: - ./.gitlab/script/ghcup_hls.sh test:linux:cross-armv7: - stage: test + stage: expensive-test extends: - .test_ghcup_version - .debian variables: - GHC_VERSION: "8.10.5" - GHC_TARGET_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.6" + GHC_TARGET_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" CROSS: "arm-linux-gnueabihf" needs: [] when: manual @@ -317,15 +319,15 @@ test:linux:cross-armv7: - ./.gitlab/script/ghcup_cross.sh test:linux:git:hadrian: - stage: test + stage: expensive-test extends: - .test_ghcup_version - .debian variables: - GHC_VERSION: "8.10.6" + GHC_VERSION: "8.10.7" GHC_GIT_TAG: "ghc-9.0.1-release" GHC_GIT_VERSION: "9.0.1" - CABAL_VERSION: "3.4.0.0" + CABAL_VERSION: "3.6.2.0" CROSS: "" needs: [] when: manual @@ -342,8 +344,8 @@ test:linux:32bit: stage: test extends: .test_ghcup_version:linux32 variables: - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.2.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" needs: [] ######## arm tests ######## @@ -352,8 +354,8 @@ test:linux:armv7: stage: test extends: .test_ghcup_version:armv7 variables: - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" CROSS: "" when: manual needs: [] @@ -362,8 +364,8 @@ test:linux:aarch64: stage: test extends: .test_ghcup_version:aarch64 variables: - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" CROSS: "" when: manual needs: [] @@ -374,16 +376,16 @@ test:mac: stage: test extends: .test_ghcup_version:darwin variables: - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" needs: [] test:mac:aarch64: stage: test extends: .test_ghcup_version:darwin:aarch64 variables: - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" needs: [] allow_failure: true @@ -394,8 +396,8 @@ test:freebsd12: stage: test extends: .test_ghcup_version:freebsd12 variables: - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" allow_failure: true # freebsd runners are unreliable when: manual needs: [] @@ -404,8 +406,8 @@ test:freebsd13: stage: test extends: .test_ghcup_version:freebsd13 variables: - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" allow_failure: true # freebsd runners are unreliable when: manual needs: [] @@ -416,8 +418,8 @@ test:windows: stage: test extends: .test_ghcup_version:windows variables: - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" needs: [] # test:windows:scoop: @@ -437,8 +439,8 @@ release:linux:64bit: - ./.gitlab/before_script/linux/alpine/install_deps.sh variables: ARTIFACT: "x86_64-linux-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" release:linux:32bit: @@ -451,8 +453,8 @@ release:linux:32bit: - ./.gitlab/before_script/linux/alpine/install_deps.sh variables: ARTIFACT: "i386-linux-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.2.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" release:linux:armv7: stage: release @@ -464,8 +466,8 @@ release:linux:armv7: - ./.gitlab/before_script/linux/install_deps.sh variables: ARTIFACT: "armv7-linux-ghcup" - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" CROSS: "" release:linux:aarch64: @@ -478,8 +480,8 @@ release:linux:aarch64: - ./.gitlab/before_script/linux/install_deps.sh variables: ARTIFACT: "aarch64-linux-ghcup" - GHC_VERSION: "8.10.4" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" CROSS: "" ######## darwin release ######## @@ -495,8 +497,8 @@ release:darwin: - ./.gitlab/before_script/darwin/install_deps.sh variables: ARTIFACT: "x86_64-apple-darwin-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" MACOSX_DEPLOYMENT_TARGET: "10.7" release:darwin:aarch64: @@ -528,8 +530,8 @@ release:darwin:aarch64: runInNixShell ./.gitlab/script/ghcup_release.sh 2>&1 variables: ARTIFACT: "aarch64-apple-darwin-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" MACOSX_DEPLOYMENT_TARGET: "10.7" allow_failure: true @@ -547,8 +549,8 @@ release:freebsd12: - ./.gitlab/before_script/freebsd/install_deps.sh variables: ARTIFACT: "x86_64-portbld-freebsd-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" allow_failure: true release:freebsd13: @@ -562,8 +564,8 @@ release:freebsd13: - ./.gitlab/before_script/freebsd/install_deps.sh variables: ARTIFACT: "x86_64-portbld-freebsd-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" allow_failure: true ######## windows release ######## @@ -579,8 +581,8 @@ release:windows: - bash ./.gitlab/before_script/windows/install_deps.sh variables: ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VERSION: "8.10.6" - CABAL_VERSION: "3.4.0.0" + GHC_VERSION: "8.10.7" + CABAL_VERSION: "3.6.2.0" ######## hlint ######## diff --git a/cabal.project b/cabal.project index 674b9da..2855c1c 100644 --- a/cabal.project +++ b/cabal.project @@ -8,7 +8,9 @@ package ghcup tests: True flags: +tui -constraints: http-io-streams -brotli +constraints: http-io-streams -brotli, + any.Cabal ==3.4.0.0 || ==3.6.2.0 + package libarchive flags: -system-libarchive diff --git a/ghcup.cabal b/ghcup.cabal index 0d7bf2a..938d338 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -98,7 +98,7 @@ library , base16-bytestring >=0.1.1.6 && <1.1 , binary ^>=0.8.6.0 , bytestring ^>=0.10 - , Cabal + , Cabal ^>=3.6.2.0 , case-insensitive ^>=1.2.1.0 , casing ^>=0.1.4.1 , containers ^>=0.6 diff --git a/stack.yaml b/stack.yaml index b156de1..c80bcb5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,13 +4,14 @@ packages: - . extra-deps: + - Cabal-3.6.2.0@sha256:e2266e14758c1f799220fad7f0d4b0b4ec567d81b7ba3faea17ff76d4c31de95,12437 - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445 - ascii-string-1.0.1.4@sha256:fa34f1d9ba57e8e89c0d4c9cef5e01ba32cb2d4373d13f92dcc0b531a6c6749b,2582 - base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231 - brick-0.64@sha256:f03fa14607c22cf48af99e24c44f79a0fb073f7ec229f15e969fed9ff73c93f6,16530 - brotli-0.0.0.0@sha256:2bf383a4cd308745740986be0b18381c5a0784393fe69b91456aacb2d603de46,2964 - brotli-streams-0.0.0.0@sha256:1af1e22f67b8bfd6ad0d05e61825e7a178d738f689ebbb21c1aab5f1bbcae176,2331 - - chs-cabal-0.1.1.0@sha256:20ec6a9fb5ab6991f1a4adf157c537bd5d3b98d08d3c09c387c954c7c50bd011,1153 + - chs-cabal-0.1.1.1 - chs-deps-0.1.0.0@sha256:0cdada6d2c682c41b20331b8c63c2ecfc7e806928585195fd544c9d41f3074fd,2496 - composition-prelude-3.0.0.2@sha256:1ffed216bd28d810fce0b5be83a661e2a892696d73b3f8de5c0f5edb9b5f0090,1216 - haskus-utils-data-1.4@sha256:bfa94363b94b14779edd6834fbd59dbb847c3d7b8f48e3844f456ffdc077da4a,1466