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.
pull/8271/head
Dylan Baker 4 years ago committed by Jussi Pakkanen
parent cbdef0479e
commit c321339b24
  1. 2
      .github/workflows/images.yml
  2. 7
      .github/workflows/os_comp.yml
  3. 2
      ci/ciimage/ubuntu-rolling/image.json
  4. 6
      ci/ciimage/ubuntu-rolling/install.sh
  5. 0
      ci/ciimage/ubuntu-rolling/test.sh

@ -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

@ -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 }}

@ -1,5 +1,5 @@
{
"base_image": "ubuntu:eoan",
"base_image": "ubuntu:rolling",
"env": {
"CI": "1",
"DC": "gdc"

@ -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
Loading…
Cancel
Save