summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2020-12-11 17:05:17 +0100
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2020-12-11 17:05:17 +0100
commit2207b49c996314b6296e465c4d1b8be95f2beb71 (patch)
tree828cd0805be50008f4fa7af88b3371880b416f3e
parenta7809d725d53545a08208fe0ad625d44f2819331 (diff)
downloadsigc++-2207b49c996314b6296e465c4d1b8be95f2beb71.tar.gz
CI: Do some tests with Meson
Remove test with clang 7. Test gcc 9 and clang 10 with meson instead of autotools.
-rw-r--r--.github/workflows/autotools-clang-10.yml28
-rw-r--r--.github/workflows/autotools-clang-7.yml25
-rw-r--r--.github/workflows/autotools-gcc-9.yml26
-rw-r--r--.github/workflows/meson-clang-10.yml35
-rw-r--r--.github/workflows/meson-gcc-9.yml35
5 files changed, 70 insertions, 79 deletions
diff --git a/.github/workflows/autotools-clang-10.yml b/.github/workflows/autotools-clang-10.yml
deleted file mode 100644
index 84e9f73..0000000
--- a/.github/workflows/autotools-clang-10.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: "CI: autotools: clang 10"
-
-on: [push]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
- container: ubuntu:20.04
-
- steps:
- - uses: actions/checkout@v1
- - name: Build
- run: |
- # Prevent blocking the install on a question during configuring of tzdata.
- export ENV DEBIAN_FRONTEND=noninteractive
- apt update
- apt install build-essential mm-common clang-10 --yes
- export CXX=clang++-10
- ./autogen.sh --enable-warnings=fatal
- make
- - name: Test
- run: make check
- - name: Distcheck
- run: |
- # distcheck runs configure again so we need to specify CXX again.
- export CXX=clang++-10
- make distcheck
diff --git a/.github/workflows/autotools-clang-7.yml b/.github/workflows/autotools-clang-7.yml
deleted file mode 100644
index 62fb16f..0000000
--- a/.github/workflows/autotools-clang-7.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: "CI: autotools: clang 7"
-
-on: [push]
-
-jobs:
- build:
-
- runs-on: ubuntu-18.04
-
- steps:
- - uses: actions/checkout@v1
- - name: Build
- run: |
- sudo apt update
- sudo apt install mm-common clang-7
- export CXX=clang++-7
- ./autogen.sh --enable-warnings=fatal
- make
- - name: Test
- run: make check
- - name: Distcheck
- run: |
- # distcheck runs configure again so we need to specify CXX again.
- export CXX=clang++-7
- make distcheck
diff --git a/.github/workflows/autotools-gcc-9.yml b/.github/workflows/autotools-gcc-9.yml
deleted file mode 100644
index f8eb697..0000000
--- a/.github/workflows/autotools-gcc-9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: "CI: autotools: gcc 9"
-
-on: [push]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v1
- - uses: docker://ubuntu:19.10
- - name: Build
- run: |
- sudo apt update
- sudo apt install mm-common g++-9
- export CXX=g++-9
- ./autogen.sh --enable-warnings=fatal
- make
- - name: Test
- run: make check
- - name: Distcheck
- run: |
- # distcheck runs configure again so we need to specify CXX again.
- export CXX=g++-9
- make distcheck
diff --git a/.github/workflows/meson-clang-10.yml b/.github/workflows/meson-clang-10.yml
new file mode 100644
index 0000000..cc67450
--- /dev/null
+++ b/.github/workflows/meson-clang-10.yml
@@ -0,0 +1,35 @@
+name: "CI: meson: clang 10"
+
+on: [push]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+ container: ubuntu:20.04
+
+ steps:
+ - uses: actions/checkout@v1
+ - name: Build
+ run: |
+ # Prevent blocking apt install on a question during configuring of tzdata.
+ export ENV DEBIAN_FRONTEND=noninteractive
+ apt update
+ apt install mm-common clang-10 meson ninja-build python3-setuptools --yes
+ export CXX=clang++-10
+ meson -Dwarnings=fatal _build
+ cd _build
+ # Meson from 0.54.0 understands "meson compile".
+ # Ubuntu 20.04 uses meson 0.53.2.
+ ninja
+ - name: Test
+ run: |
+ cd _build
+ meson test
+ - name: Dist
+ run: |
+ apt install git --yes
+ # dist runs setup again so we need to specify CXX again.
+ export CXX=clang++-10
+ cd _build
+ meson dist
diff --git a/.github/workflows/meson-gcc-9.yml b/.github/workflows/meson-gcc-9.yml
new file mode 100644
index 0000000..864f8af
--- /dev/null
+++ b/.github/workflows/meson-gcc-9.yml
@@ -0,0 +1,35 @@
+name: "CI: meson: gcc 9"
+
+on: [push]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+ container: ubuntu:20.04
+
+ steps:
+ - uses: actions/checkout@v1
+ - name: Build
+ run: |
+ # Prevent blocking apt install on a question during configuring of tzdata.
+ export ENV DEBIAN_FRONTEND=noninteractive
+ apt update
+ apt install mm-common g++-9 meson ninja-build python3-setuptools --yes
+ export CXX=g++-9
+ meson -Dwarnings=fatal _build
+ cd _build
+ # Meson from 0.54.0 understands "meson compile".
+ # Ubuntu 20.04 uses meson 0.53.2.
+ ninja
+ - name: Test
+ run: |
+ cd _build
+ meson test
+ - name: Dist
+ run: |
+ apt install git --yes
+ # dist runs setup again so we need to specify CXX again.
+ export CXX=g++-9
+ cd _build
+ meson dist