From 432431df7795d4afc0324d6a20e848977249fb8f Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Sat, 9 Nov 2024 12:53:58 -0500 Subject: [PATCH] Ubuntu and Debian use NodeJS 20 from nodesource Not more ppc64le for Ubuntu or Debian builds --- .github/workflows/tests.yml | 7 +++++-- .gitlab-ci.yml | 12 ++++++------ packaging/deb/control | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b0f85eb3..faa37b563 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -141,12 +141,15 @@ jobs: # Amazon 2023 doesn't have ppc64le containers - dist: amzn2023 arch: ppc64le - # Ubuntu doesn't have way to get NodeJS 14+ on ppc64le + # Ubuntu and Debian doesn't have way to get NodeJS 20+ on ppc64le - dist: ubuntu-20.04 arch: ppc64le - # Ubuntu doesn't have way to get NodeJS 14+ on ppc64le - dist: ubuntu-22.04 arch: ppc64le + - dist: ubuntu-24.04 + arch: ppc64le + - dist: debian-12 + arch: ppc64le runs-on: ${{ matrix.os }} name: E2E test ${{ matrix.dist }}-${{ matrix.arch }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82ec2d37c..a64aa0300 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,14 +27,14 @@ build-nightly: - OOD_PACKAGING_DIST: [el8] OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec - - OOD_PACKAGING_DIST: [el9, debian-12] + - OOD_PACKAGING_DIST: [el9] OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] # Ubuntu doesn't have way to get NodeJS 14+ on ppc64le - - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04] + - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04, debian-12] OOD_PACKAGING_ARCH: [x86_64, aarch64] # Ubuntu 24.04 on aarch64 is slow and will time out - OOD_PACKAGING_DIST: [ubuntu-24.04] - OOD_PACKAGING_ARCH: [x86_64, ppc64le] + OOD_PACKAGING_ARCH: [x86_64] # Amazon 2023 on aarch64 is slow and will time out - OOD_PACKAGING_DIST: [amzn2023] OOD_PACKAGING_ARCH: [x86_64] @@ -60,14 +60,14 @@ build: - OOD_PACKAGING_DIST: [el8] OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec - - OOD_PACKAGING_DIST: [el9, debian-12] + - OOD_PACKAGING_DIST: [el9] OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] # Ubuntu doesn't have way to get NodeJS 14+ on ppc64le - - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04] + - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04, debian-12] OOD_PACKAGING_ARCH: [x86_64, aarch64] # Ubuntu 24.04 on aarch64 is slow and will time out - OOD_PACKAGING_DIST: [ubuntu-24.04] - OOD_PACKAGING_ARCH: [x86_64, ppc64le] + OOD_PACKAGING_ARCH: [x86_64] # Amazon 2023 on aarch64 is slow and will time out - OOD_PACKAGING_DIST: [amzn2023] OOD_PACKAGING_ARCH: [x86_64] diff --git a/packaging/deb/control b/packaging/deb/control index b85120013..1285b1e76 100644 --- a/packaging/deb/control +++ b/packaging/deb/control @@ -5,7 +5,7 @@ Maintainer: Ohio Supercomputer Center Build-Depends: debhelper (>=11~), curl, build-essential, tzdata, libxml2-dev, libxslt-dev, pkg-config, zlib1g-dev, liblzma-dev, ruby, ruby-dev, - nodejs (>= 18.0), nodejs (<< 19.0), + nodejs (>= 20.0), nodejs (<< 21.0), sqlite3, libsqlite3-dev, python3@EXTRA_DEPENDS@ Standards-Version: 4.1.4 Homepage: https://openondemand.org @@ -15,7 +15,7 @@ Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, ruby, apache2, sudo, lsof, lua-posix, tzdata, file, - nodejs (>= 18.0), nodejs (<< 19.0), + nodejs (>= 20.0), nodejs (<< 21.0), ondemand-nginx (= 1.26.1.p6.0.23.ood4.0), ondemand-passenger (= 6.0.23.ood4.0) Recommends: rclone Description: Open OnDemand is an open source release of the Ohio SuperComputer Center's