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

upgrade all platforms for 3.8.0 #122

Merged
merged 5 commits into from
Dec 11, 2023
Merged

upgrade all platforms for 3.8.0 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb34950
upgrade the platforms
mmomtchev Dec 11, 2023
20cb0e5
update the Debian/Ubuntu install procedure
mmomtchev Dec 11, 2023
fa50df8
do not use sudo
mmomtchev Dec 11, 2023
34d01bc
run update after adding new repos
mmomtchev Dec 11, 2023
a06831b
force Python 3 on Debian
mmomtchev Dec 11, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
node-version: [ 14, 16, 18, 20 ]
node-version: [ 16, 18, 20, 21 ]

steps:
- uses: actions/checkout@v3
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
bundled_gdal_coverage:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:

strategy:
matrix:
node-version: [ 14, 16, 18, 20 ]
node-version: [ 16, 18, 20, 21 ]
gdal-version: [ 'shared', 'bundled' ]

steps:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-npm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
19 changes: 10 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
2 changes: 1 addition & 1 deletion scripts/container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions test/platforms/Dockerfile.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions test/platforms/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down