summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-04-29 18:23:23 +0300
committerGitHub <noreply@github.com>2020-04-29 18:23:23 +0300
commit6e794c380ba2febe67f563c3388797b8b4482f82 (patch)
treeeacb4e6f629d7292d9e22825be10f915b3f9ca10 /.github/workflows
parent1cf7f40e8542acf3b65ec18e1414edb65113fe42 (diff)
parenteefc7d450c7839db63df2d8a6e4bcc991205a058 (diff)
downloadmeson-6e794c380ba2febe67f563c3388797b8b4482f82.tar.gz
Merge pull request #6911 from mensinda/ciBionic
ci: Add Ubuntu Bionic image
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/images.yml1
-rw-r--r--.github/workflows/os_comp.yml5
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index bde222375..0cf9156f9 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -31,6 +31,7 @@ jobs:
- { name: CUDA (on Arch), id: cuda }
- { name: Fedora, id: fedora }
- { name: OpenSUSE, id: opensuse }
+ - { name: Ubuntu Bionic, id: bionic }
- { name: Ubuntu Eoan, id: eoan }
steps:
- uses: actions/checkout@v2
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index 7f3437e31..a5abf7da1 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -11,7 +11,7 @@ jobs:
name: Ubuntu 16.04
runs-on: ubuntu-16.04
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Install Dependencies
run: |
sudo apt update -yq
@@ -39,9 +39,10 @@ jobs:
- { name: CUDA (on Arch), id: cuda }
- { name: Fedora, id: fedora }
- { name: OpenSUSE, id: opensuse }
+ - { name: Ubuntu Bionic, id: bionic }
container: mesonbuild/${{ matrix.cfg.id }}:latest
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- 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