diff --git a/.available-versions b/.available-versions index 6d75bca29d21c8c015cf722e3a0e1e4fab0475d2..4aead1324946e59267c3f9272cfb93206960ebde 100644 --- a/.available-versions +++ b/.available-versions @@ -28,4 +28,5 @@ ghc 8.10.1 latest,8.10 cabal-install 2.2.0.0 cabal-install 2.4.0.0 cabal-install 2.4.1.0 -cabal-install 3.0.0.0 latest,recommended +cabal-install 3.0.0.0 +cabal-install 3.2.0.0 latest,recommended diff --git a/.download-urls b/.download-urls index 0b1c111a48e417b2e30abf0bb473a19a95cad3e4..155519b95988478282654c3f0b602a9549242c90 100644 --- a/.download-urls +++ b/.download-urls @@ -170,3 +170,7 @@ cabal-install 2.4.1.0 x86_64 unknown https://downl cabal-install 3.0.0.0 x86_64 darwin https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz cabal-install 3.0.0.0 i386 unknown https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-unknown-linux.tar.xz cabal-install 3.0.0.0 x86_64 unknown https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-unknown-linux.tar.xz + +cabal-install 3.2.0.0 x86_64 darwin https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-apple-darwin17.7.0.tar.xz +cabal-install 3.2.0.0 i386 unknown https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz +cabal-install 3.2.0.0 x86_64 unknown https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-unknown-linux.tar.xz diff --git a/.gitlab/before_script/linux/install_shellcheck.sh b/.gitlab/before_script/linux/install_shellcheck.sh index 21ed907835c1f307bfe94ef826e9e11944c8b1f3..cbc3c8e25123f91e765ff155294ff744a4c412ea 100755 --- a/.gitlab/before_script/linux/install_shellcheck.sh +++ b/.gitlab/before_script/linux/install_shellcheck.sh @@ -3,7 +3,7 @@ set -eux # install shellcheck -wget https://storage.googleapis.com/shellcheck/shellcheck-latest.linux.x86_64.tar.xz +wget https://github.com/koalaman/shellcheck/releases/download/latest/shellcheck-latest.linux.x86_64.tar.xz tar -xJf shellcheck-latest.linux.x86_64.tar.xz mkdir -p "$CI_PROJECT_DIR"/.local/bin/ mv shellcheck-latest/shellcheck "$CI_PROJECT_DIR"/.local/bin/shellcheck