Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump test environment to Ubuntu 22.04 #242

Merged
merged 7 commits into from
Nov 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ The format is based on [Keep a Changelog].
* The new `scripts/pnp-bin.js` script is standalone minified nodejs built
from the [`pnp-bin`](https://github.com/PuddleByteComputing/pnp-bin) repo,
extracted from apheleia PR [#200].
* Test environment bumped from Ubuntu 20.04 to 22.04

### Bugs fixed
* `ktlint` would emit log messages into its stdout when formatting,
Expand Down Expand Up @@ -76,7 +77,7 @@ The format is based on [Keep a Changelog].
* [`rubocop`](https://github.com/rubocop/rubocop) for [ruby](https://www.ruby-lang.org/en/) ([#176]).
* [`ruby-standard`](https://github.com/standardrb/standard) for
[ruby](https://www.ruby-lang.org/en/) ([#201])
* [`ruff`](https://github.com/astral-sh/ruff) for
* [`ruff`](https://github.com/astral-sh/ruff) for
[python](https://python.org) ([#236])
* [`rufo`](https://github.com/ruby-formatter/rufo) for
[Ruby](https://www.ruby-lang.org/en/) ([#177]).
Expand Down
2 changes: 1 addition & 1 deletion test/formatters/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Ubuntu 20.04 LTS supported until April 2025
FROM ubuntu:20.04 AS common
FROM ubuntu:22.04 AS common

WORKDIR /build
COPY install-common.bash /build/
Expand Down
6 changes: 1 addition & 5 deletions test/formatters/installers/brittany.bash
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/formatters/installers/fourmolu.bash
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test/formatters/installers/nixfmt.bash
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions test/formatters/installers/ormolu.bash
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions test/formatters/installers/rustfmt.bash
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions test/formatters/samplecode/perltidy/out.pl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
$c = 142;
$t = 255;
@t = map {
$_ % 16
$_ % 16
or $t ^= $c ^=
( $m = ( 11, 10, 116, 100, 11, 122, 20, 100 )[ $_ / 16 % 8 ] ) & 110;
$t ^= (
Expand All @@ -15,8 +15,8 @@
)[ $_ % 8 ]
} ( 16 .. 271 );
if ( ( @a = unx "C*", $_ )[20] & 48 ) {
$h = 5;
$_ = unxb24, join "",
$h = 5;
$_ = unxb24, join "",
@b = map { xB8, unxb8, chr( $_ ^ $a[ --$h + 84 ] ) } @ARGV;
s/...$/1$&/;
$d = unxV, xb25, $_;
Expand Down