diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 369c91e2d..7d83920de 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -43,11 +43,9 @@ jobs: - { name: Fedora, id: fedora } - { name: Gentoo, id: gentoo } - { name: OpenSUSE, id: opensuse } - - { name: Ubuntu Bionic, id: bionic } - { name: Ubuntu Rolling, id: ubuntu-rolling } steps: - # Need v3 because of bionic - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 # Login to dockerhub - name: Docker login diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 4b9b7a4a6..135635822 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -42,24 +42,13 @@ jobs: - { name: Fedora, id: fedora } - { name: Gentoo, id: gentoo } - { name: OpenSUSE, id: opensuse } - - { name: Ubuntu Bionic, id: bionic } container: image: mesonbuild/${{ matrix.cfg.id }}:latest - volumes: - - ${{ matrix.cfg.id == 'bionic' && '/node20217:/node20217:rw,rshared' || ' ' }} - - ${{ matrix.cfg.id == 'bionic' && '/node20217:/__e/node20:ro,rshared' || ' ' }} env: MESON_CI_JOBNAME: linux-${{ matrix.cfg.id }}-gcc steps: - - name: install nodejs20glibc2.17 - if: ${{ matrix.cfg.id == 'bionic' }} - 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 + - uses: actions/checkout@v6 - name: Run tests # All environment variables are stored inside the docker image in /ci/env_vars.sh diff --git a/ci/ciimage/bionic/image.json b/ci/ciimage/bionic/image.json deleted file mode 100644 index 5df709e7e..000000000 --- a/ci/ciimage/bionic/image.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "base_image": "ubuntu:bionic", - "env": { - "CI": "1", - "DC": "gdc", - "MESON_CI_JOBNAME": "linux-bionic-gcc" - } -} diff --git a/ci/ciimage/bionic/install.sh b/ci/ciimage/bionic/install.sh deleted file mode 100755 index 23e0774fa..000000000 --- a/ci/ciimage/bionic/install.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -set -e - -source /ci/common.sh - -export DEBIAN_FRONTEND=noninteractive -export LANG='C.UTF-8' -export DC=gdc - -pkgs=( - python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev - python3.7 python3.7-dev - wget unzip cmake doxygen - clang - pkg-config-arm-linux-gnueabihf - qt4-linguist-tools qt5-default qtbase5-private-dev - python-dev - libomp-dev - llvm lcov - ldc - libclang-dev - libgcrypt20-dev - libgpgme-dev - libhdf5-dev openssh-server - libboost-python-dev libboost-regex-dev - libblocksruntime-dev - libperl-dev libscalapack-mpi-dev libncurses-dev - itstool - openjdk-11-jre -) - -boost_pkgs=(atomic chrono date-time filesystem log regex serialization system test thread) - -sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" -apt-get -y update -apt-get -y upgrade -apt-get -y install eatmydata - -# Base stuff -eatmydata apt-get -y build-dep meson - -# Add boost packages -for i in "${boost_pkgs[@]}"; do - for j in "1.62.0" "1.65.1"; do - pkgs+=("libboost-${i}${j}") - done -done - -# packages -eatmydata apt-get -y install "${pkgs[@]}" - -# Actually select the right python version -update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1 \ - --slave /usr/lib/x86_64-linux-gnu/pkgconfig/python3.pc python3.pc /usr/lib/x86_64-linux-gnu/pkgconfig/python-3.6.pc -update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 2 \ - --slave /usr/lib/x86_64-linux-gnu/pkgconfig/python3.pc python3.pc /usr/lib/x86_64-linux-gnu/pkgconfig/python-3.7.pc - -python3 -m pip install -U "${base_python_pkgs[@]}" "${python_pkgs[@]}" - -# Install the ninja 0.10 -wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip -unzip ninja-linux.zip -d /ci - -# cleanup -apt-get -y remove ninja-build -apt-get -y clean -apt-get -y autoclean -rm ninja-linux.zip diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index 1e93fa57f..89c86c42d 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -233,33 +233,6 @@ The following statement is sufficient for Meson to find Boost: - cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 ``` -## Travis without Docker - -Non-Docker Travis-CI builds can use Linux, MacOS or Windows. -Set the desired compiler(s) in the build **matrix**. -This example is for **Linux** (Ubuntu 18.04) and **C**. - -```yaml -dist: bionic -group: travis_latest - -os: linux -language: python - -matrix: - include: - - env: CC=gcc - - env: CC=clang - -install: - - pip install meson ninja - -script: - - meson setup builddir - - meson compile -C builddir - - meson test -C builddir -``` - ## GitHub Actions GitHub Actions provides a versatile platform for continuous integration diff --git a/run_shell_checks.py b/run_shell_checks.py index f929d80e1..a22005397 100755 --- a/run_shell_checks.py +++ b/run_shell_checks.py @@ -23,7 +23,6 @@ permitted_files = ( 'ci/ciimage/ubuntu-rolling/test.sh', 'ci/ciimage/cuda-cross/install.sh', 'ci/ciimage/cuda/install.sh', - 'ci/ciimage/bionic/install.sh', 'ci/ciimage/fedora/install.sh', 'ci/ciimage/arch/install.sh', 'ci/ciimage/gentoo/install.sh', diff --git a/test cases/frameworks/16 sdl2/test.json b/test cases/frameworks/16 sdl2/test.json index b95067fd2..a2eb08b75 100644 --- a/test cases/frameworks/16 sdl2/test.json +++ b/test cases/frameworks/16 sdl2/test.json @@ -7,7 +7,7 @@ { "val": "config-tool" }, { "val": "sdlconfig" }, { "val": "extraframework", "expect_skip_on_os": ["!darwin"], "expect_skip_on_jobname": ["macos"] }, - { "val": "cmake", "expect_skip_on_jobname": ["bionic"] } + { "val": "cmake" } ] } }, diff --git a/test cases/frameworks/26 netcdf/test.json b/test cases/frameworks/26 netcdf/test.json index b2149f548..99a9d7d4a 100644 --- a/test cases/frameworks/26 netcdf/test.json +++ b/test cases/frameworks/26 netcdf/test.json @@ -1,3 +1,3 @@ { - "expect_skip_on_jobname": ["azure", "bionic", "cygwin", "fedora", "macos", "msys2", "opensuse", "ubuntu", "windows"] + "expect_skip_on_jobname": ["azure", "cygwin", "fedora", "macos", "msys2", "opensuse", "ubuntu", "windows"] } diff --git a/test cases/frameworks/30 scalapack/test.json b/test cases/frameworks/30 scalapack/test.json index 412f39d21..ed10af0c9 100644 --- a/test cases/frameworks/30 scalapack/test.json +++ b/test cases/frameworks/30 scalapack/test.json @@ -1,3 +1,3 @@ { - "expect_skip_on_jobname": ["azure", "bionic", "cygwin", "fedora", "msys2", "opensuse", "windows"] + "expect_skip_on_jobname": ["azure", "cygwin", "fedora", "msys2", "opensuse", "windows"] } diff --git a/test cases/frameworks/34 gir static lib/test.json b/test cases/frameworks/34 gir static lib/test.json index 093722cbf..bbd38c9cc 100644 --- a/test cases/frameworks/34 gir static lib/test.json +++ b/test cases/frameworks/34 gir static lib/test.json @@ -5,5 +5,5 @@ {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirlib.dll.a"}, {"type": "file", "file": "usr/share/gir-1.0/Meson-1.0.gir"} ], - "expect_skip_on_jobname": ["azure", "bionic", "macos", "msys2", "windows"] + "expect_skip_on_jobname": ["azure", "macos", "msys2", "windows"] } diff --git a/test cases/frameworks/40 qt qml/test.json b/test cases/frameworks/40 qt qml/test.json index 1beecd18d..0f6a2c3fc 100644 --- a/test cases/frameworks/40 qt qml/test.json +++ b/test cases/frameworks/40 qt qml/test.json @@ -18,5 +18,5 @@ {"type": "file", "file": "usr/qml/My/Module5/qmldir"}, {"type": "file", "file": "usr/qml/My/Module5/My_Module5.qmltypes"} ], - "expect_skip_on_jobname": ["cygwin", "msys2", "azure", "bionic", "macos", "windows"] + "expect_skip_on_jobname": ["cygwin", "msys2", "azure", "macos", "windows"] }