upgrade all platforms for 3.8.0 (#122)

* upgrade the platforms * update the Debian/Ubuntu install procedure * do not use sudo * run update after adding new repos * force Python 3 on Debian
mmomtchev · Dec 11, 2023 · bdd4995 · bdd4995
1 parent ccdb78c
commit bdd4995
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 25 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 14, 16, 18, 20 ]
+        node-version: [ 16, 18, 20, 21 ]
 
     steps:
     - uses: actions/checkout@v3
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 14.x, 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 21.x ]
         platforms: [ windows-2019, macos-11 ]
 
     steps:

diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   bundled_gdal_coverage:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
@@ -108,7 +108,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 14, 16, 18, 20 ]
+        node-version: [ 16, 18, 20, 21 ]
         gdal-version: [ 'shared', 'bundled' ]
 
     steps:
@@ -153,7 +153,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 14.x, 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 21.x ]
 
     steps:
     - uses: actions/checkout@v3
@@ -223,7 +223,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 14.x, 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 21.x ]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         platforms: [ ubuntu-20.04, ubuntu-22.04, windows-2019, macos-11 ]
-        node-version: [ 14.x, 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 21.x ]
 
     steps:
     - name: Use Node.js ${{ matrix.node-version }}
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         platforms: [ ubuntu-20.04, ubuntu-22.04, windows-2019, macos-11 ]
-        node-version: [ 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 21.x ]
 
     steps:
     - name: Use Node.js ${{ matrix.node-version }}

diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
@@ -21,12 +21,14 @@ jobs:
         - debian:bullseye
         - centos:stream8
         - amazonlinux:2022
-        node-version: [ 14, 16, 18, 20 ]
+        node-version: [ 16, 18, 20, 21 ]
         include:
           - linux-version: fedora:36
             node-version: 18
           - linux-version: fedora:37
             node-version: 18
+          - linux-version: fedora:38
+            node-version: 20
 
     steps:
     - uses: actions/checkout@v3
@@ -46,7 +48,7 @@ jobs:
     strategy:
       matrix:
         platforms: [ windows-2019, macos-11 ]
-        node-version: [ 14.x, 16.x, 18.x, 20.x ]
+        node-version: [ 16.x, 18.x, 20.x, 21.x ]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - GEOS 3.12.1
  - HDF5 1.14.3
  - NetCDF 4.9.2
+ - Node.js 21 support
+
+### Changed
+ - Upgrade the main test platform from Ubuntu 20.04 to Ubuntu 22.04
+
+### Removed
+ - Drop Node.js 14 support
 
 ## [3.7.3] 2023-11-28
 

diff --git a/README.md b/README.md
@@ -337,27 +337,28 @@ Development versions are unit tested for the following targets:
 | Node.js 18.x | Fedora 36| system-installed GDAL 3.4.3
 | Node.js 18.x | Fedora 37 | system-installed GDAL 3.5.2
 | Node.js 18.x | Fedora 37 | bundled GDAL
-| Node.js 14.x | Ubuntu 20.04 | system-installed GDAL 3.0.4
+| Node.js 20.x | Fedora 38 | bundled GDAL
 | Node.js 16.x | Ubuntu 20.04 | system-installed GDAL 3.0.4
 | Node.js 17.x | Ubuntu 20.04 | system-installed GDAL 3.0.4
 | Node.js 18.x | Ubuntu 20.04 | system-installed GDAL 3.0.4
 | Node.js 14.x | Ubuntu 22.04 | system-installed GDAL 3.4.1
 | Node.js 18.x | Ubuntu 22.04 | system-installed GDAL 3.4.1
 | Node.js 20.x | Ubuntu 22.04 | system-installed GDAL 3.4.1
-| Node.js 12.x | Ubuntu 20.04 | bundled GDAL
-| Node.js 14.x | Ubuntu 20.04 | bundled GDAL (*code coverage platform*)
-| Node.js 16.x | Ubuntu 20.04 | bundled GDAL
-| Node.js 17.x | Ubuntu 20.04 | bundled GDAL
-| Node.js 18.x | Ubuntu 20.04 | bundled GDAL
-| Node.js 14.x | Amazon Linux 2022 | bundled GDAL
-| Node.js 14.x | Windows Server 2019 | bundled GDAL
+| Node.js 21.x | Ubuntu 22.04 | system-installed GDAL 3.4.1
+| Node.js 16.x | Ubuntu 22.04 | bundled GDAL (*code coverage platform*)
+| Node.js 17.x | Ubuntu 22.04 | bundled GDAL
+| Node.js 18.x | Ubuntu 22.04 | bundled GDAL
+| Node.js 20.x | Ubuntu 22.04 | bundled GDAL
+| Node.js 21.x | Ubuntu 22.04 | bundled GDAL
+| Node.js 16.x | Amazon Linux 2022 | bundled GDAL
 | Node.js 16.x | Windows Server 2019 | bundled GDAL
 | Node.js 17.x | Windows Server 2019 | bundled GDAL
 | Node.js 18.x | Windows Server 2019 | bundled GDAL
 | Node.js 20.x | Windows Server 2019 | bundled GDAL
-| Node.js 14.x | macOS Big Sur 11 | bundled GDAL
+| Node.js 21.x | Windows Server 2019 | bundled GDAL
 | Node.js 16.x | macOS Big Sur 11 | bundled GDAL
 | Node.js 17.x | macOS Big Sur 11 | bundled GDAL
 | Node.js 18.x | macOS Big Sur 11 | bundled GDAL
 | Node.js 20.x | macOS Big Sur 11 | bundled GDAL
+| Node.js 21.x | macOS Big Sur 11 | bundled GDAL
 ---
diff --git a/scripts/container.sh b/scripts/container.sh
@@ -5,7 +5,7 @@ DIST=$2
 NODEJS=$3
 GDAL=$4
 if [ -z "${OP}" ]; then
-  echo "container.sh <release|dev|shell> [ubuntu:{18.04|20.04|21.10}|centos:stream8|fedora:{33|34}|debian:{buster|bullseye}|amazonlinux:2022] [<Node.js version>] [shared]"
+  echo "container.sh <release|dev|shell> [ubuntu:{18.04|20.04|22.04}|centos:stream8|fedora:{36|37|38}|debian:{buster|bullseye}|amazonlinux:2022] [<Node.js version>] [shared]"
   exit 1
 fi
 if [ ! -d "test/platforms" ]; then

diff --git a/test/platforms/Dockerfile.debian b/test/platforms/Dockerfile.debian
@@ -7,10 +7,15 @@ ENV GDAL=${GDAL}
 
 RUN \
   DEBIAN_FRONTEND=noninteractive apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y curl rsync && \
-  curl -fsSL https://deb.nodesource.com/setup_${NODEJS}.x | bash - && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y curl rsync ca-certificates curl gnupg && \
+  mkdir -p /etc/apt/keyrings && \
+  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | \
+    gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODEJS}.x nodistro main" |  \
+    tee /etc/apt/sources.list.d/nodesource.list && \
+  DEBIAN_FRONTEND=noninteractive apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y python git build-essential ccache && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y python3 git build-essential ccache && \
   mkdir -p /target && chmod 777 /target
 
 RUN if [ "${GDAL}" = "shared" ]; then DEBIAN_FRONTEND=noninteractive apt-get install -y libgdal-dev; fi

diff --git a/test/platforms/Dockerfile.ubuntu b/test/platforms/Dockerfile.ubuntu
@@ -7,8 +7,13 @@ ENV GDAL=${GDAL}
 
 RUN \
   DEBIAN_FRONTEND=noninteractive apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y curl rsync && \
-  curl -fsSL https://deb.nodesource.com/setup_${NODEJS}.x | bash - && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y curl rsync ca-certificates curl gnupg && \
+  mkdir -p /etc/apt/keyrings && \
+  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | \
+    gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODEJS}.x nodistro main" |  \
+    tee /etc/apt/sources.list.d/nodesource.list && \
+  DEBIAN_FRONTEND=noninteractive apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs && \
   if [ `lsb_release -cs` = 'xenial' ]; then \
     DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common python-software-properties && \