diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-01-26 10:49:14 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-01-29 19:40:25 +0000 |
| commit | c321339b24f896d02b0839d1b1e5008eae405858 (patch) | |
| tree | b2f70aa8e963024132bc54812af7c63b78905189 | |
| parent | cbdef0479eba33228bf35ddef7b7c2eceda4ec64 (diff) | |
| download | meson-c321339b24f896d02b0839d1b1e5008eae405858.zip meson-c321339b24f896d02b0839d1b1e5008eae405858.tar.gz meson-c321339b24f896d02b0839d1b1e5008eae405858.tar.bz2 | |
Change the Eoan CI to ubuntu rolling ci
This makes the Ubuntu CI always use the latest release, without us
having to manually change it.
| -rw-r--r-- | .github/workflows/images.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/os_comp.yml | 7 | ||||
| -rw-r--r-- | ci/ciimage/ubuntu-rolling/image.json (renamed from ci/ciimage/eoan/image.json) | 2 | ||||
| -rwxr-xr-x | ci/ciimage/ubuntu-rolling/install.sh (renamed from ci/ciimage/eoan/install.sh) | 6 | ||||
| -rwxr-xr-x | ci/ciimage/ubuntu-rolling/test.sh (renamed from ci/ciimage/eoan/test.sh) | 0 |
5 files changed, 7 insertions, 10 deletions
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 0cf9156..87fae3b 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -32,7 +32,7 @@ jobs: - { name: Fedora, id: fedora } - { name: OpenSUSE, id: opensuse } - { name: Ubuntu Bionic, id: bionic } - - { name: Ubuntu Eoan, id: eoan } + - { name: Ubuntu Rolling, id: ubuntu-rolling } steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 1883588..3cdcccd 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -21,7 +21,6 @@ on: - "run_unittests.py" jobs: - arch: name: ${{ matrix.cfg.name }} runs-on: ubuntu-latest strategy: @@ -42,8 +41,8 @@ jobs: # via the `args` array ub the image.json run: bash -c 'source /ci/env_vars.sh; cd $GITHUB_WORKSPACE; ./run_tests.py $CI_ARGS' - eoan: - name: 'Ubuntu Eoan' + ubuntu-rolling: + name: 'Ubuntu Rolling' runs-on: ubuntu-latest strategy: @@ -72,7 +71,7 @@ jobs: CXX: 'g++' container: - image: mesonbuild/eoan + image: mesonbuild/ubuntu-rolling env: MESON_RSP_THRESHOLD: ${{ matrix.cfg.MESON_RSP_THRESHOLD }} MESON_ARGS: ${{ matrix.cfg.MESON_ARGS }} diff --git a/ci/ciimage/eoan/image.json b/ci/ciimage/ubuntu-rolling/image.json index cbf86c3..038b945 100644 --- a/ci/ciimage/eoan/image.json +++ b/ci/ciimage/ubuntu-rolling/image.json @@ -1,5 +1,5 @@ { - "base_image": "ubuntu:eoan", + "base_image": "ubuntu:rolling", "env": { "CI": "1", "DC": "gdc" diff --git a/ci/ciimage/eoan/install.sh b/ci/ciimage/ubuntu-rolling/install.sh index 36dec72..507113b 100755 --- a/ci/ciimage/eoan/install.sh +++ b/ci/ciimage/ubuntu-rolling/install.sh @@ -9,14 +9,12 @@ export LANG='C.UTF-8' export DC=gdc pkgs=( - python3-pytest-xdist + python3-pytest-xdist python3-jsonschema python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev python3-lxml wget unzip qt5-default clang pkg-config-arm-linux-gnueabihf - qt4-linguist-tools - python-dev libomp-dev llvm lcov dub ldc @@ -43,7 +41,7 @@ eatmydata apt-get -y build-dep meson eatmydata apt-get -y install "${pkgs[@]}" eatmydata apt-get -y install --no-install-recommends wine-stable # Wine is special -eatmydata python3 -m pip install hotdoc codecov gcovr jsonschema +eatmydata python3 -m pip install hotdoc codecov gcovr # dub stuff dub_fetch urld diff --git a/ci/ciimage/eoan/test.sh b/ci/ciimage/ubuntu-rolling/test.sh index d00df6f..d00df6f 100755 --- a/ci/ciimage/eoan/test.sh +++ b/ci/ciimage/ubuntu-rolling/test.sh |