diff options
Diffstat (limited to 'test/formatters/installers')
| -rw-r--r-- | test/formatters/installers/brittany.bash | 6 | ||||
| -rw-r--r-- | test/formatters/installers/fourmolu.bash | 6 | ||||
| -rw-r--r-- | test/formatters/installers/nixfmt.bash | 2 | ||||
| -rw-r--r-- | test/formatters/installers/ormolu.bash | 6 | ||||
| -rw-r--r-- | test/formatters/installers/rustfmt.bash | 6 |
5 files changed, 9 insertions, 17 deletions
diff --git a/test/formatters/installers/brittany.bash b/test/formatters/installers/brittany.bash index 719e198..b6b0699 100644 --- a/test/formatters/installers/brittany.bash +++ b/test/formatters/installers/brittany.bash @@ -1,10 +1,6 @@ # PPA recommended at https://www.haskell.org/cabal/download.html -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FF3AEACEF6F88286 -echo "deb [arch=amd64] http://ppa.launchpad.net/hvr/ghc/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/brittany.list -apt-get update -apt-get install -y cabal-install-3.4 ghc -ln -s /opt/cabal/bin/cabal /usr/local/bin/ +apt-get install -y ghc cabal-install cabal v2-update cabal v2-install brittany --reorder-goals diff --git a/test/formatters/installers/fourmolu.bash b/test/formatters/installers/fourmolu.bash index 525b1c4..3b78655 100644 --- a/test/formatters/installers/fourmolu.bash +++ b/test/formatters/installers/fourmolu.bash @@ -1,4 +1,4 @@ -apt-get install -y haskell-platform -cabal update -cabal install fourmolu +apt-get install -y ghc cabal-install +cabal v2-update +cabal v2-install fourmolu --reorder-goals cp "${HOME}/.cabal/bin/fourmolu" /usr/local/bin diff --git a/test/formatters/installers/nixfmt.bash b/test/formatters/installers/nixfmt.bash index 213a59b..d489829 100644 --- a/test/formatters/installers/nixfmt.bash +++ b/test/formatters/installers/nixfmt.bash @@ -1,4 +1,4 @@ ver="$(latest_release serokell/nixfmt)" -wget "https://github.com/serokell/nixfmt/releases/download/${ver}/nixfmt" -O /usr/local/bin/nixfmt +wget "https://github.com/serokell/nixfmt/releases/download/${ver}/nixfmt-x86_64-linux" -O /usr/local/bin/nixfmt chmod +x /usr/local/bin/nixfmt diff --git a/test/formatters/installers/ormolu.bash b/test/formatters/installers/ormolu.bash index 2f4a08f..db6c4d4 100644 --- a/test/formatters/installers/ormolu.bash +++ b/test/formatters/installers/ormolu.bash @@ -1,4 +1,4 @@ -apt-get install -y haskell-platform -cabal update -cabal install ormolu +apt-get install -y ghc cabal-install +cabal v2-update +cabal v2-install ormolu --reorder-goals cp "${HOME}/.cabal/bin/ormolu" /usr/local/bin diff --git a/test/formatters/installers/rustfmt.bash b/test/formatters/installers/rustfmt.bash index 7ce08d8..5d30b88 100644 --- a/test/formatters/installers/rustfmt.bash +++ b/test/formatters/installers/rustfmt.bash @@ -1,5 +1 @@ -ver="$(latest_release rust-lang/rustfmt | sed 's/^v//')" - -wget "https://github.com/rust-lang/rustfmt/releases/download/v${ver}/rustfmt_linux-x86_64_v${ver}.tar.gz" -O rustfmt.tar.gz -tar -xf rustfmt.tar.gz -cp rustfmt*/rustfmt /usr/local/bin/ +apt-get install rustfmt -y |
