From b2a6afd6b4bfa70383bd248d2f654382e16c9eb0 Mon Sep 17 00:00:00 2001 From: Arek Rus Date: Wed, 6 Apr 2022 13:10:44 +0200 Subject: [PATCH 01/12] use temurin jdk --- lib/travis/build/bash/travis_install_jdk.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index 54d0c9dbed..b79e644ea9 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -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" ;; *) @@ -52,8 +52,8 @@ 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 - - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - + sudo add-apt-repository --yes https://packages.adoptium.net/artifactory/deb sudo apt-get update -yqq sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true sudo update-java-alternatives -s "$PACKAGE"* From 030c200120d69b77b8a8c9723be98d5aa40defe2 Mon Sep 17 00:00:00 2001 From: Arek Rus Date: Wed, 6 Apr 2022 13:10:44 +0200 Subject: [PATCH 02/12] use temurin jdk --- lib/travis/build/bash/travis_install_jdk.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index b79e644ea9..7a4b7afdd7 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -47,11 +47,11 @@ travis_install_jdk_package() { local JAVA_VERSION JAVA_VERSION="$1" sudo apt-get update -yqq - PACKAGE="adoptopenjdk-${JAVA_VERSION}-hotspot" + PACKAGE="temurin-${JAVA_VERSION}-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 + if dpkg-query -l temurin* >/dev/null 2>&1; then + dpkg-query -l temurin* | grep temurin | awk '{print $2}' | xargs sudo dpkg -P + fi wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - sudo add-apt-repository --yes https://packages.adoptium.net/artifactory/deb sudo apt-get update -yqq From af437125ff079dc597f08d921e45a5a1dd816992 Mon Sep 17 00:00:00 2001 From: Arek Rus <57007917+r-arek@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:02:28 +0200 Subject: [PATCH 03/12] test find_jdk_path --- lib/travis/build/bash/travis_find_jdk_path.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/travis/build/bash/travis_find_jdk_path.bash b/lib/travis/build/bash/travis_find_jdk_path.bash index d27c5b81bd..5262bdb987 100644 --- a/lib/travis/build/bash/travis_find_jdk_path.bash +++ b/lib/travis/build/bash/travis_find_jdk_path.bash @@ -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/temurin-${version}.*jdk*" elif [[ "$vendor" == "oracle" ]]; then apt_glob="/usr*/lib/jvm/java-${version}-oracle" fi From 1adadd21ce7d8db70c2aba8e2462fdd55f3e346b Mon Sep 17 00:00:00 2001 From: Arek Rus <57007917+r-arek@users.noreply.github.com> Date: Thu, 7 Apr 2022 16:45:45 +0200 Subject: [PATCH 04/12] fix path --- lib/travis/build/bash/travis_install_jdk.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index 7a4b7afdd7..e255915183 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -56,6 +56,10 @@ travis_install_jdk_package() { sudo add-apt-repository --yes https://packages.adoptium.net/artifactory/deb 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/temurin-${JAVA_VERSION}-jdk-${TRAVIS_CPU_ARCH}" --echo + travis_cmd 'export PATH="$JAVA_HOME/bin:$PATH"' --echo + echo $PATH + echo $JAVA_HOME sudo update-java-alternatives -s "$PACKAGE"* fi } From 3076728931f282864ed5481b8bcce7b270c8e4a9 Mon Sep 17 00:00:00 2001 From: Stanislav Kolotinskiy Date: Fri, 8 Apr 2022 13:22:57 +0300 Subject: [PATCH 05/12] Fix JDK path issue --- .../build/bash/travis_find_jdk_path.bash | 2 +- lib/travis/build/bash/travis_install_jdk.bash | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/travis/build/bash/travis_find_jdk_path.bash b/lib/travis/build/bash/travis_find_jdk_path.bash index d27c5b81bd..5262bdb987 100644 --- a/lib/travis/build/bash/travis_find_jdk_path.bash +++ b/lib/travis/build/bash/travis_find_jdk_path.bash @@ -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/temurin-${version}.*jdk*" elif [[ "$vendor" == "oracle" ]]; then apt_glob="/usr*/lib/jvm/java-${version}-oracle" fi diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index 54d0c9dbed..e255915183 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -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" ;; *) @@ -47,15 +47,19 @@ travis_install_jdk_package() { local JAVA_VERSION JAVA_VERSION="$1" sudo apt-get update -yqq - PACKAGE="adoptopenjdk-${JAVA_VERSION}-hotspot" + PACKAGE="temurin-${JAVA_VERSION}-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/ + if dpkg-query -l temurin* >/dev/null 2>&1; then + dpkg-query -l temurin* | grep temurin | awk '{print $2}' | xargs sudo dpkg -P + fi + wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - + sudo add-apt-repository --yes https://packages.adoptium.net/artifactory/deb 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/temurin-${JAVA_VERSION}-jdk-${TRAVIS_CPU_ARCH}" --echo + travis_cmd 'export PATH="$JAVA_HOME/bin:$PATH"' --echo + echo $PATH + echo $JAVA_HOME sudo update-java-alternatives -s "$PACKAGE"* fi } From 42fccd77ed64f0a504e801d1e8ac28bc1555634e Mon Sep 17 00:00:00 2001 From: AndriiMysko Date: Wed, 27 Apr 2022 16:25:35 +0300 Subject: [PATCH 06/12] Fix tests --- lib/travis/build/bash/travis_install_jdk.bash | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index e255915183..7927d6fd57 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -51,15 +51,13 @@ travis_install_jdk_package() { if ! dpkg -s "$PACKAGE" >/dev/null 2>&1; then if dpkg-query -l temurin* >/dev/null 2>&1; then dpkg-query -l temurin* | grep temurin | awk '{print $2}' | xargs sudo dpkg -P - fi + fi wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - sudo add-apt-repository --yes https://packages.adoptium.net/artifactory/deb 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/temurin-${JAVA_VERSION}-jdk-${TRAVIS_CPU_ARCH}" --echo - travis_cmd 'export PATH="$JAVA_HOME/bin:$PATH"' --echo - echo $PATH - echo $JAVA_HOME + travis_cmd "export PATH=\"$JAVA_HOME/bin:$PATH\"" --echo sudo update-java-alternatives -s "$PACKAGE"* fi } From bed15de26ddbec267c03206e1858d0d0de5263d1 Mon Sep 17 00:00:00 2001 From: Arek Rus <57007917+r-arek@users.noreply.github.com> Date: Thu, 26 May 2022 11:15:23 +0200 Subject: [PATCH 07/12] try amazon corretto --- lib/travis/build/bash/travis_install_jdk.bash | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index e255915183..a1881576d5 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -47,16 +47,19 @@ travis_install_jdk_package() { local JAVA_VERSION JAVA_VERSION="$1" sudo apt-get update -yqq - PACKAGE="temurin-${JAVA_VERSION}-jdk" + 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 temurin* >/dev/null 2>&1; then dpkg-query -l temurin* | grep temurin | awk '{print $2}' | xargs sudo dpkg -P fi - wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - - sudo add-apt-repository --yes https://packages.adoptium.net/artifactory/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/temurin-${JAVA_VERSION}-jdk-${TRAVIS_CPU_ARCH}" --echo + travis_cmd "export JAVA_HOME=/usr/lib/jvm/java-${JAVA_VERSION}-amazon-corretto" --echo travis_cmd 'export PATH="$JAVA_HOME/bin:$PATH"' --echo echo $PATH echo $JAVA_HOME From 0c886e630a8676184d74068ae338ee0a3cfe022f Mon Sep 17 00:00:00 2001 From: Murtaza Khan Date: Thu, 2 Jun 2022 14:13:11 +0500 Subject: [PATCH 08/12] ghc_json update --- public/version-aliases/ghc.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/public/version-aliases/ghc.json b/public/version-aliases/ghc.json index 879f3fd358..20072ea8fd 100644 --- a/public/version-aliases/ghc.json +++ b/public/version-aliases/ghc.json @@ -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" } \ No newline at end of file From 048270ac9c4d36cb509263bd2321a5a2fdd187b8 Mon Sep 17 00:00:00 2001 From: Arek Rus <57007917+r-arek@users.noreply.github.com> Date: Fri, 3 Jun 2022 09:13:25 +0200 Subject: [PATCH 09/12] Update travis_find_jdk_path.bash --- lib/travis/build/bash/travis_find_jdk_path.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/travis/build/bash/travis_find_jdk_path.bash b/lib/travis/build/bash/travis_find_jdk_path.bash index 5262bdb987..2e7a970814 100644 --- a/lib/travis/build/bash/travis_find_jdk_path.bash +++ b/lib/travis/build/bash/travis_find_jdk_path.bash @@ -4,7 +4,7 @@ travis_find_jdk_path() { vendor="$2" version="$3" if [[ "$vendor" == "openjdk" ]]; then - apt_glob="/usr/lib/jvm/temurin-${version}.*jdk*" + apt_glob="/usr/lib/jvm/java-${version}-amazon-corretto" elif [[ "$vendor" == "oracle" ]]; then apt_glob="/usr*/lib/jvm/java-${version}-oracle" fi From 8360819785520178c67ee22c6d4e98a5ab9c8036 Mon Sep 17 00:00:00 2001 From: Arek Rus <57007917+r-arek@users.noreply.github.com> Date: Fri, 3 Jun 2022 09:26:04 +0200 Subject: [PATCH 10/12] remove dpkg check --- lib/travis/build/bash/travis_install_jdk.bash | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index a1881576d5..596cac65b4 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -52,9 +52,6 @@ travis_install_jdk_package() { fi PACKAGE="java-${JAVA_VERSION}-amazon-corretto-jdk" if ! dpkg -s "$PACKAGE" >/dev/null 2>&1; then - if dpkg-query -l temurin* >/dev/null 2>&1; then - dpkg-query -l temurin* | grep temurin | awk '{print $2}' | xargs sudo dpkg -P - fi 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 From b606dfb257a7d5044d3a43fdd43821914630018c Mon Sep 17 00:00:00 2001 From: Arek Rus <57007917+r-arek@users.noreply.github.com> Date: Fri, 3 Jun 2022 10:16:29 +0200 Subject: [PATCH 11/12] Cleanup --- lib/travis/build/bash/travis_install_jdk.bash | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash index 596cac65b4..191164f078 100644 --- a/lib/travis/build/bash/travis_install_jdk.bash +++ b/lib/travis/build/bash/travis_install_jdk.bash @@ -58,8 +58,6 @@ travis_install_jdk_package() { 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 - echo $PATH - echo $JAVA_HOME sudo update-java-alternatives -s "$PACKAGE"* fi } From e8429bdd175298097ef24b2dc5051c94cd681b3b Mon Sep 17 00:00:00 2001 From: Murtaza Khan Date: Fri, 3 Jun 2022 17:01:09 +0500 Subject: [PATCH 12/12] ghc_json update --- public/version-aliases/ghc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/version-aliases/ghc.json b/public/version-aliases/ghc.json index 89c33f0251..20072ea8fd 100644 --- a/public/version-aliases/ghc.json +++ b/public/version-aliases/ghc.json @@ -181,4 +181,4 @@ "9.4.1-alpha1": "9.4.1-alpha1", "9.4": "9.4.1-alpha2", "9.4.1-alpha2": "9.4.1-alpha2" -} +} \ No newline at end of file