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

Bug fix cycle 8 #2025

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

Bug fix cycle 8 #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b2a6afd
use temurin jdk
r-arek Apr 6, 2022
030c200
use temurin jdk
r-arek Apr 6, 2022
af43712
test find_jdk_path
r-arek Apr 6, 2022
1adadd2
fix path
r-arek Apr 7, 2022
3076728
Fix JDK path issue
Apr 8, 2022
42fccd7
Fix tests
AndriiMysko Apr 27, 2022
ae8afaa
Merge pull request #2017 from travis-ci/sc-jdk-fix
travis-architect Apr 28, 2022
bed15de
try amazon corretto
r-arek May 26, 2022
46b79e3
Merge branch 'master' into bug-fix-cycle-8
murtaza-swati Jun 1, 2022
0c886e6
ghc_json update
murtaza-swati Jun 2, 2022
048270a
Update travis_find_jdk_path.bash
r-arek Jun 3, 2022
8360819
remove dpkg check
r-arek Jun 3, 2022
ba81c86
Merge branch 'bug-fix-cycle-8' into arek-jdk
r-arek Jun 3, 2022
b606dfb
Cleanup
r-arek Jun 3, 2022
b0260a8
Merge pull request #2026 from travis-ci/arek-jdk
murtaza-swati Jun 3, 2022
2c73f28
Merge branch 'master' into bug-fix-cycle-8
murtaza-swati Jun 3, 2022
e8429bd
ghc_json update
murtaza-swati Jun 3, 2022
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
2 changes: 1 addition & 1 deletion lib/travis/build/bash/travis_find_jdk_path.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ travis_find_jdk_path() {
vendor="$2"
version="$3"
if [[ "$vendor" == "openjdk" ]]; then
apt_glob="/usr/lib/jvm/java-1.${version}.*openjdk*"
apt_glob="/usr/lib/jvm/java-${version}-amazon-corretto"
elif [[ "$vendor" == "oracle" ]]; then
apt_glob="/usr*/lib/jvm/java-${version}-oracle"
fi
Expand Down
16 changes: 9 additions & 7 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 @@ -5,7 +5,7 @@ travis_install_jdk() {
version="$3"

case "${TRAVIS_CPU_ARCH}" in
"arm64" | "s390x" | "ppc64le")
"arm64" | "s390x" | "ppc64le" | "amd64")
travis_install_jdk_package "$version"
;;
*)
Expand Down Expand Up @@ -47,15 +47,17 @@ travis_install_jdk_package() {
local JAVA_VERSION
JAVA_VERSION="$1"
sudo apt-get update -yqq
PACKAGE="adoptopenjdk-${JAVA_VERSION}-hotspot"
if [[ "$JAVA_VERSION" == "8" ]]; then
JAVA_VERSION="1.8.0"
fi
PACKAGE="java-${JAVA_VERSION}-amazon-corretto-jdk"
if ! dpkg -s "$PACKAGE" >/dev/null 2>&1; then
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 -
sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
wget -O- https://apt.corretto.aws/corretto.key | sudo apt-key add -
sudo add-apt-repository 'deb https://apt.corretto.aws stable main'
sudo apt-get update -yqq
sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
travis_cmd "export JAVA_HOME=/usr/lib/jvm/java-${JAVA_VERSION}-amazon-corretto" --echo
travis_cmd 'export PATH="$JAVA_HOME/bin:$PATH"' --echo
sudo update-java-alternatives -s "$PACKAGE"*
fi
}
18 changes: 11 additions & 7 deletions public/version-aliases/ghc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,19 @@
"9.0.1-alpha1": "9.0.1-alpha1",
"9.0": "9.0.2",
"9.0.1": "9.0.1",
"9": "9.2.2",
"9.x": "9.2.2",
"9.x.x": "9.2.2",
"9": "9.2.3",
"9.x": "9.2.3",
"9.x.x": "9.2.3",
"9.0.x": "9.0.2",
"9.0.2": "9.0.2",
"9.2.1-alpha1": "9.2.1-alpha1",
"9.2": "9.2.2",
"9.2": "9.2.3",
"9.2.1-alpha2": "9.2.1-alpha2",
"9.2.1": "9.2.1",
"9.2.x": "9.2.2",
"9.2.2": "9.2.2"
}
"9.2.x": "9.2.3",
"9.2.2": "9.2.2",
"9.2.3": "9.2.3",
"9.4.1-alpha1": "9.4.1-alpha1",
"9.4": "9.4.1-alpha2",
"9.4.1-alpha2": "9.4.1-alpha2"
}