JDK fix, nvm update

travis-ci · Nov 15, 2023 · 1d15d3a · 1d15d3a
1 parent 5f4de32
commit 1d15d3a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/lib/travis/build/bash/travis_install_jdk.bash b/lib/travis/build/bash/travis_install_jdk.bash
@@ -85,15 +85,15 @@ travis_install_jdk_package_bellsoft() {
  if ! dpkg -s "$PACKAGE" >/dev/null 2>&1; then
  if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
  wget -qO - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
- sudo add-apt-repository "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ stable main"
+ sudo add-apt-repository --yes "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ 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/bellsoft-java${JAVA_VERSION}-aarch64" --echo
  travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
  sudo update-java-alternatives -s "$PACKAGE"*
  else
  wget -qO - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
- sudo add-apt-repository "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ stable main"
+ sudo add-apt-repository --yes "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ 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/bellsoft-java${JAVA_VERSION}-${TRAVIS_CPU_ARCH}" --echo

diff --git a/lib/travis/build/script/node_js/manager/nvm.rb b/lib/travis/build/script/node_js/manager/nvm.rb
@@ -23,7 +23,15 @@ def update
  sh.raw "source #{nvm_dir}/nvm.sh", assert: false
  end
 
+ def update_nvm
+ nvm_ver = 'v0.39.5'
+ nvm_dir = "${TRAVIS_HOME}/.nvm"
+ sh.raw "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/#{nvm_ver}/install.sh | bash &> /dev/null", assert: false
+ sh.raw "source #{nvm_dir}/nvm.sh", assert: false
+ end
+
  def install
+ update_nvm
  if node_js_given_in_config?
  use_version node_js.version
  else
@@ -52,6 +60,7 @@ def use_version version
  end
 
  def install_version(ver)
+ update_nvm
  sh.fold "nvm.install" do
  sh.cmd "nvm install #{ver}#{stderrlog}", assert: false, timing: true
  sh.if '$? -ne 0' do

diff --git a/public/version-aliases/ghc.json b/public/version-aliases/ghc.json
@@ -166,9 +166,9 @@
  "9.0.1-alpha1": "9.0.1-alpha1",
  "9.0": "9.0.2",
  "9.0.1": "9.0.1",
- "9": "9.8.0.20230809",
- "9.x": "9.8.0.20230809",
- "9.x.x": "9.8.0.20230809",
+ "9": "9.8.1",
+ "9.x": "9.8.1",
+ "9.x.x": "9.8.1",
  "9.0.x": "9.0.2",
  "9.0.2": "9.0.2",
  "9.2.1-alpha1": "9.2.1-alpha1",
@@ -184,19 +184,21 @@
  "9.2.7": "9.2.7",
  "9.2.8": "9.2.8",
  "9.4.1-alpha1": "9.4.1-alpha1",
- "9.4": "9.4.6",
+ "9.4": "9.4.8",
  "9.4.1-alpha2": "9.4.1-alpha2",
  "9.4.1-alpha3": "9.4.1-alpha3",
  "9.4.1": "9.4.1",
- "9.4.x": "9.4.6",
+ "9.4.x": "9.4.8",
  "9.4.2": "9.4.2",
  "9.4.3": "9.4.3",
  "9.4.4": "9.4.4",
  "9.4.5": "9.4.5",
  "9.4.6": "9.4.6",
+ "9.4.7": "9.4.7",
+ "9.4.8": "9.4.8",
  "9.6.0.20230111": "9.6.0.20230111",
- "9.6.x": "9.6.2",
- "9.6": "9.6.2",
+ "9.6.x": "9.6.3",
+ "9.6": "9.6.3",
  "9.6.0.20230128": "9.6.0.20230128",
  "9.6.0.20230210": "9.6.0.20230210",
  "9.6.0.20230302": "9.6.0.20230302",
@@ -205,10 +207,17 @@
  "9.6.1-alpha3": "9.6.1-alpha3",
  "9.6.1": "9.6.1",
  "9.6.2": "9.6.2",
+ "9.6.3": "9.6.3",
  "9.8.0.20230727": "9.8.0.20230727",
- "9.8.x": "9.8.0.20230809",
- "9.8": "9.8.1-alpha2",
+ "9.8.x": "9.8.1",
+ "9.8": "9.8.1",
  "9.8.0.20230809": "9.8.0.20230809",
+ "9.8.0.20230822": "9.8.0.20230822",
+ "9.8.0.20230919": "9.8.0.20230919",
+ "9.8.0.20230929": "9.8.0.20230929",
  "9.8.1-alpha1": "9.8.1-alpha1",
- "9.8.1-alpha2": "9.8.1-alpha2"
+ "9.8.1-alpha2": "9.8.1-alpha2",
+ "9.8.1-alpha3": "9.8.1-alpha3",
+ "9.8.1-alpha4": "9.8.1-alpha4",
+ "9.8.1": "9.8.1"
 }