diff options
| author | Ed Slocomb <edslocomb@gmail.com> | 2023-11-11 16:24:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 16:24:28 -0800 |
| commit | f884d1d61108d4942dd02c95bf5fd05daeedf47e (patch) | |
| tree | a23cc0a46e651fabe95b22e7cb24124265567e26 /test/formatters/installers/brittany.bash | |
| parent | 314af56e8dc1eb9f71a70e6c1858e6f6021cf708 (diff) | |
Bump test environment to Ubuntu 22.04 (#242)
This also fixes a few test installers:
- rustfmt is available via apt-get in 22.04, use that instead of tarball
that's no longer available
- brittany now installs cleanly in the default haskell ghc/cabal in
22.04, so just use that
- perltidy in 22.04 has slightly different output
- nixfmt download url changed (now includes OS/arch). There was
initially no binary available when nixfmt was updated,
but the devs there were kind enough to provide one:
https://github.com/serokell/nixfmt/issues/139
This runs a full `make fmt-build` without errors, though it takes a
while ;). All tests pass, too.
Diffstat (limited to 'test/formatters/installers/brittany.bash')
| -rw-r--r-- | test/formatters/installers/brittany.bash | 6 |
1 files changed, 1 insertions, 5 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 |