Skip to content

Commit

Permalink
Change the Eoan CI to ubuntu rolling ci
Browse files Browse the repository at this point in the history
This makes the Ubuntu CI always use the latest release, without us
having to manually change it.
  • Loading branch information
dcbaker authored and jpakkane committed Jan 29, 2021
1 parent cbdef04 commit c321339
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/os_comp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ on:
- "run_unittests.py"

jobs:
arch:
name: ${{ matrix.cfg.name }}
runs-on: ubuntu-latest
strategy:
Expand All @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"base_image": "ubuntu:eoan",
"base_image": "ubuntu:rolling",
"env": {
"CI": "1",
"DC": "gdc"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
File renamed without changes.

0 comments on commit c321339

Please sign in to comment.