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.

Sign up for GitHub

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

Unsilence JDK install commands #1984

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Unsilence JDK install commands #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f1498f
Update ghc.json
Apr 13, 2021
f528255
Unsilence JDK install commands
native-api Apr 13, 2021
ea0bb9b
Wget no-verbose is enough
native-api Apr 13, 2021
5cb2f59
`apt -yq` is sufficient
native-api Apr 13, 2021
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
6 changes: 3 additions & 3 deletions lib/travis/build/bash/travis_install_jdk.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ travis_install_jdk_package() {
if dpkg-query -l adoptopenjdk* >/dev/null 2>&1; then
dpkg-query -l adoptopenjdk* | grep adoptopenjdk | awk '{print $2}' | xargs sudo dpkg -P
fi
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
wget -nv -O - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
sudo apt-get update -yqq
sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
sudo apt-get update -yq
sudo apt-get -yq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
sudo update-java-alternatives -s "$PACKAGE"*
fi
}
20 changes: 14 additions & 6 deletions public/version-aliases/ghc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
"7.10.2": "7.10.2",
"7.10.3": "7.10.3",
"8.0.1": "8.0.1",
"8": "8.10.3",
"8.x": "8.10.3",
"8.x.x": "8.10.3",
"8": "8.10.4",
"8.x": "8.10.4",
"8.x.x": "8.10.4",
"8.0.x": "8.0.2",
"8.0": "8.0.2",
"8.0.2": "8.0.2",
Expand Down Expand Up @@ -153,12 +153,20 @@
"8.8.3": "8.8.3",
"8.8.4": "8.8.4",
"8.10.1-alpha1": "8.10.1-alpha1",
"8.10": "8.10.3",
"8.10": "8.10.4",
"8.10.1-alpha2": "8.10.1-alpha2",
"8.10.1": "8.10.1",
"8.10.x": "8.10.3",
"8.10.x": "8.10.4",
"8.10.2": "8.10.2",
"8.10.3": "8.10.3",
"8.10.4": "8.10.4",
"9.0.1-alpha1": "9.0.1-alpha1",
"9.0": "9.0.1-alpha1"
"9.0": "9.0.1",
"9.0.1": "9.0.1",
"9": "9.0.1",
"9.x": "9.0.1",
"9.x.x": "9.0.1",
"9.0.x": "9.0.1",
"9.2.1-alpha1": "9.2.1-alpha1",
"9.2": "9.2.1-alpha1"
}