From 56753ce218fea8c547e5e21b13340cfc8cd9917d Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 10 Dec 2024 03:57:40 +0000 Subject: [PATCH] ci: try disgusting hack for nodejs on bionic --- .github/workflows/os_comp.yml | 23 ++++++++++++++--------- mesonbuild/arglist.py | 1 + 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 0830a05e5836..d09329d7e9cb 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -26,12 +26,6 @@ on: - ".github/workflows/os_comp.yml" - "run*tests.py" -# make GHA actions use node16 which still works with bionic -# See https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ -# Unclear how long this will work though -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - permissions: contents: read @@ -49,13 +43,24 @@ jobs: - { name: Gentoo, id: gentoo } - { name: OpenSUSE, id: opensuse } - { name: Ubuntu Bionic, id: bionic } - container: mesonbuild/${{ matrix.cfg.id }}:latest + container: + - image: mesonbuild/${{ matrix.cfg.id }}:latest + volumes: + - ${{ inputs.id == 'bionic' && inputs.architecture == 'x86_64' && '/node20217:/node20217:rw,rshared' || ' ' }} + - ${{ inputs.id == 'bionic' && inputs.architecture == 'x86_64' && '/node20217:/__e/node20:ro,rshared' || ' ' }} env: MESON_CI_JOBNAME: linux-${{ matrix.cfg.id }}-gcc steps: - # Need v3 because of bionic - - uses: actions/checkout@v3 + - name: install nodejs20glibc2.17 + if: ${{ inputs.id == 'bionic' && inputs.architecture == 'x86_64' }} + run: | + apt install curl -y + curl -LO https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz + tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217 + ldd /__e/node20/bin/node + - uses: actions/checkout@v4 + - name: Run tests # All environment variables are stored inside the docker image in /ci/env_vars.sh # They are defined in the `env` section in each image.json. CI_ARGS should be set diff --git a/mesonbuild/arglist.py b/mesonbuild/arglist.py index 54d7157e2ccf..61e1c955ed07 100644 --- a/mesonbuild/arglist.py +++ b/mesonbuild/arglist.py @@ -1,3 +1,4 @@ +# test # SPDX-License-Identifier: Apache-2.0 # Copyright 2012-2020 The Meson development team # Copyright © 2020-2023 Intel Corporation