Skip to content

Commit

Permalink
upgrade CentOS to stream9 (#160)
Browse files Browse the repository at this point in the history
* switch to centos 9

* this is the new powertools name

* curl is part of base now

* upgrade node.js to 20

* update the readme

* try without alternatives
  • Loading branch information
mmomtchev authored Jun 13, 2024
1 parent c84f167 commit 0c4a032
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:

strategy:
matrix:
linux-version: [ 'ubuntu:22.04', 'ubuntu:20.04', 'debian:bullseye', 'fedora:37', 'centos:stream8' ]
linux-version: [ 'ubuntu:22.04', 'ubuntu:20.04', 'debian:bullseye', 'fedora:37', 'centos:stream9' ]

steps:
- uses: actions/checkout@v4
Expand All @@ -73,7 +73,7 @@ jobs:
with:
max-size: 1000M
key: distros-shared-${{ matrix.linux-version }}
- run: npm run container dev ${{ matrix.linux-version }} 16 shared
- run: npm run container dev ${{ matrix.linux-version }} 20 shared
env:
MOCHA_TEST_NETWORK: ${{ github.event.inputs.testNetwork }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- ubuntu:22.04
- debian:buster
- debian:bullseye
- centos:stream8
- centos:stream9
- amazonlinux:2022
node-version: [ 16, 18, 20, 21 ]
include:
Expand All @@ -30,7 +30,7 @@ jobs:
- linux-version: fedora:38
node-version: 20
exclude:
- linux-version: centos:stream8
- linux-version: centos:stream9
node-version: 21

steps:
Expand Down
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ Unless required by applicable law or agreed to in writing, software distributed
Release binaries with pre-built bundled GDAL are tested against the full matrix of:

* Node.js versions: 14.x, 16.x, 17.x, 18.x, 20.x
* OS: Ubuntu 20.04, Ubuntu 22.04, CentOS 8 Stream, Fedora 36, Fedora 37, Debian 10 buster, Debian 11 bullseye, Arch Linux current, Amazon Linux, Windows Server 2019, macOS Catalina 10.15 (EOL), macOS Big Sur 11
* OS: Ubuntu 20.04, Ubuntu 22.04, CentOS 9 Stream, Fedora 36, Fedora 37, Debian 10 buster, Debian 11 bullseye, Arch Linux current, Amazon Linux, Windows Server 2019, macOS Catalina 10.15 (EOL), macOS Big Sur 11

On Ubuntu 16.04, Amazon Linux, Windows and macOS only the bundled GDAL version is officially supported. On all other platforms both the bundled and the system-installed versions are supported.

Expand All @@ -350,26 +350,24 @@ Development versions are unit tested for the following targets:
---
| Node | OS | GDAL |
| --- | --- | --- |
| Node.js 16.x | CentOS 8 Stream | system-installed GDAL 3.0.4
| Node.js 16.x | CentOS 8 Stream | bundled GDAL
| Node.js 16.x | Debian 10 buster | system-installed GDAL 2.1.2 (*earliest unit-tested GDAL*) (*earliest supported glibc*)
| Node.js 16.x | Debian 11 bullseye | system-installed GDAL 3.2.2
| Node.js 16.x | Debian 11 bullseye | bundled GDAL
| Node.js 20.x | CentOS 9 Stream | system-installed GDAL 3.0.4
| Node.js 20.x | CentOS 9 Stream | bundled GDAL
| Node.js 20.x | Debian 10 buster | system-installed GDAL 2.1.2 (*earliest unit-tested GDAL*) (*earliest supported glibc*)
| Node.js 20.x | Debian 11 bullseye | system-installed GDAL 3.2.2
| Node.js 20.x | Debian 11 bullseye | bundled GDAL
| 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 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 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 20.x | Ubuntu 22.04 | bundled GDAL (*code coverage platform*)
| 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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"test:u20n16": "npm run container dev ubuntu:20.04 16 shared",
"test:u20n18": "npm run container dev ubuntu:20.04 18 shared",
"test:u20n20": "npm run container dev ubuntu:20.04 20 shared",
"test:c8": "npm run container dev centos:stream8 18 shared",
"test:c8": "npm run container dev centos:stream9 18 shared",
"test:arch": "npm run container dev archlinux:latest 20 shared",
"test:f36": "npm run container dev fedora:36 18 shared",
"test:shared": "npm run test:u20 && npm run test:c8",
Expand Down
2 changes: 1 addition & 1 deletion scripts/container.sh
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|22.04}|centos:stream8|fedora:{36|37|38}|debian:{buster|bullseye}|amazonlinux:2022] [<Node.js version>] [shared]"
echo "container.sh <release|dev|shell> [ubuntu:{18.04|20.04|22.04}|centos:stream9|fedora:{36|37|38}|debian:{buster|bullseye}|amazonlinux:2022] [<Node.js version>] [shared]"
exit 1
fi
if [ ! -d "test/platforms" ]; then
Expand Down
9 changes: 4 additions & 5 deletions test/platforms/Dockerfile.centos
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=stream8
ARG VERSION=stream9
FROM quay.io/centos/centos:${VERSION}

ARG NODEJS=lts
Expand All @@ -8,13 +8,12 @@ ENV GDAL=${GDAL}
RUN \
dnf -y install dnf-plugins-core && \
dnf install -y epel-release && \
dnf config-manager --set-enabled powertools && \
dnf install -y curl rsync && \
dnf config-manager --enable crb && \
dnf install -y rsync && \
curl -fsSL https://rpm.nodesource.com/setup_${NODEJS}.x | bash - && \
dnf install -y nodejs && \
dnf groupinstall -y 'Development Tools' && \
dnf install -y git python36 ccache && \
alternatives --set python /usr/bin/python3 && \
dnf install -y git python3 ccache && \
mkdir -p /target && chmod 777 /target

RUN if [ "${GDAL}" = "shared" ]; then dnf install -y gdal-devel; fi
Expand Down

0 comments on commit 0c4a032

Please sign in to comment.