diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26325b8be..0b7ab45a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,14 @@ jobs: include: - os: ubuntu-22.04 container: rockylinux:8 + nodejs_arch: x64 nodejs_version: "^18.17.0" nodejs_version_major: 18 platform: linux-x64 prebuild: true - os: ubuntu-22.04 container: rockylinux:8 + nodejs_arch: x64 nodejs_version: "^20.3.0" nodejs_version_major: 20 platform: linux-x64 @@ -68,19 +70,9 @@ jobs: nodejs_version_major: 20 platform: win32-x64 steps: - - name: Dependencies (Linux glibc) - if: contains(matrix.container, 'centos') - run: | - yum install -y https://rpm.nodesource.com/pub_${{ matrix.nodejs_version_major }}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm - yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm - yum install -y centos-release-scl - yum install -y devtoolset-11-gcc-c++ make git python3 nodejs fontconfig google-noto-sans-fonts - echo "/opt/rh/devtoolset-11/root/usr/bin" >> $GITHUB_PATH - name: Dependencies (Rocky Linux glibc) if: contains(matrix.container, 'rockylinux') run: | - dnf install -y https://rpm.nodesource.com/pub_${{ matrix.nodejs_version_major }}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm - dnf install -y --setopt=nodesource-nodejs.module_hotfixes=1 nodejs dnf install -y gcc-toolset-11-gcc-c++ make git python3 fontconfig google-noto-sans-fonts echo "/opt/rh/gcc-toolset-11/root/usr/bin" >> $GITHUB_PATH - name: Dependencies (Linux musl) @@ -91,8 +83,8 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.11' - - name: Dependencies (Node.js - macOS, Windows) - if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows') + - name: Dependencies (Node.js) + if: "!contains(matrix.platform, 'linuxmusl')" uses: actions/setup-node@v3 with: node-version: ${{ matrix.nodejs_version }}