Skip to content

Commit 8d04b3c

Browse files
lazkadcbaker
authored andcommitted
CI: Move all remaining jobs from travis-ci to GHA
Some changes: * Set HOME to /root, since github mounts its own HOME and 'wine' (because of permissions) and 'dub' (can't find packages) don't like that. * Remove the seccomp option, doesn't seem to be needed.
1 parent b65168c commit 8d04b3c

File tree

7 files changed

+66
-118
lines changed

7 files changed

+66
-118
lines changed

.github/workflows/os_comp.yml

+66
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,69 @@ jobs:
2727
# They are defined in the `env` section in each image.json. CI_ARGS should be set
2828
# via the `args` array ub the image.json
2929
run: bash -c 'source /ci/env_vars.sh; cd $GITHUB_WORKSPACE; ./run_tests.py $CI_ARGS'
30+
31+
eoan:
32+
name: 'Ubuntu Eoan'
33+
runs-on: ubuntu-latest
34+
35+
strategy:
36+
fail-fast: false
37+
matrix:
38+
cfg:
39+
- CC: 'gcc'
40+
CXX: 'g++'
41+
- MESON_ARGS: '--unity=on'
42+
RUN_TESTS_ARGS: '--no-unittests'
43+
CC: 'gcc'
44+
CXX: 'g++'
45+
- CC: 'clang'
46+
CXX: 'clang++'
47+
- MESON_ARGS: '--unity=on'
48+
RUN_TESTS_ARGS: '--no-unittests'
49+
CC: 'clang'
50+
CXX: 'clang++'
51+
- RUN_TESTS_ARGS: '--cross ubuntu-armhf.json --cross linux-mingw-w64-64bit.json'
52+
MESON_RSP_THRESHOLD: '0'
53+
CC: 'gcc'
54+
CXX: 'g++'
55+
- RUN_TESTS_ARGS: '--cross ubuntu-armhf.json --cross linux-mingw-w64-64bit.json'
56+
MESON_ARGS: '--unity=on'
57+
CC: 'gcc'
58+
CXX: 'g++'
59+
60+
container:
61+
image: mesonbuild/eoan
62+
env:
63+
MESON_RSP_THRESHOLD: ${{ matrix.cfg.MESON_RSP_THRESHOLD }}
64+
MESON_ARGS: ${{ matrix.cfg.MESON_ARGS }}
65+
RUN_TESTS_ARGS: ${{ matrix.cfg.RUN_TESTS_ARGS }}
66+
CC: ${{ matrix.cfg.CC }}
67+
CXX: ${{ matrix.cfg.CXX }}
68+
69+
steps:
70+
- name: Checkout code
71+
uses: actions/checkout@v2
72+
73+
- name: Run tests
74+
shell: bash
75+
run: |
76+
export HOME=/root
77+
78+
export CC=$CC
79+
export CXX=$CXX
80+
export OBJC=$CC
81+
export OBJCXX=$CXX
82+
export PATH=$(pwd)/tools:$PATH
83+
if test "$MESON_RSP_THRESHOLD" != ""
84+
then
85+
export MESON_RSP_THRESHOLD=$MESON_RSP_THRESHOLD
86+
fi
87+
88+
source /ci/env_vars.sh
89+
90+
update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
91+
update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
92+
update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
93+
update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
94+
95+
./run_tests.py $RUN_TESTS_ARGS -- $MESON_ARGS

.travis.yml

-42
This file was deleted.

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ build system.
77
#### Status
88

99
[![PyPI](https://img.shields.io/pypi/v/meson.svg)](https://pypi.python.org/pypi/meson)
10-
[![Travis](https://travis-ci.org/mesonbuild/meson.svg?branch=master)](https://travis-ci.org/mesonbuild/meson)
1110
[![Build Status](https://dev.azure.com/jussi0947/jussi/_apis/build/status/mesonbuild.meson)](https://dev.azure.com/jussi0947/jussi/_build/latest?definitionId=1)
1211
[![Codecov](https://codecov.io/gh/mesonbuild/meson/coverage.svg?branch=master)](https://codecov.io/gh/mesonbuild/meson/branch/master)
1312
[![Code Quality: Python](https://img.shields.io/lgtm/grade/python/g/mesonbuild/meson.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/mesonbuild/meson/context:python)

ci/travis_install.sh

-9
This file was deleted.

ci/travis_script.sh

-57
This file was deleted.

docs/markdown/Contributing.md

-2
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,6 @@ Meson uses several continuous integration testing systems that have slightly
362362
different interfaces for indicating a commit should be skipped.
363363

364364
Continuous integration systems currently used:
365-
- [Travis-CI](https://docs.travis-ci.com/user/customizing-the-build#skipping-a-build)
366-
allows `[skip ci]` anywhere in the commit messages.
367365
- [Azure Pipelines](https://docs.microsoft.com/en-us/azure/devops/pipelines/scripts/git-commands?view=vsts&tabs=yaml#how-do-i-avoid-triggering-a-ci-build-when-the-script-pushes)
368366
allows `***NO_CI***` in the commit message.
369367
- [Sider](https://sider.review)

docs/markdown/MesonCI.md

-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ the CI setup used for testing Meson itself. The Meson
55
project uses multiple CI platforms for covering a wide
66
range of target systems.
77

8-
## Travis CI
9-
10-
The travis configuration file is the `.travis.yml` in the
11-
the project root. This platform tests cross compilation and
12-
unity builds on a [linux docker image](#docker-images) and
13-
on OSX.
14-
158
## GitHub actions
169

1710
The configuration files for GitHub actions are located in

0 commit comments

Comments
 (0)