Skip to content

Commit 9811d13

Browse files
kjellahlkjellahl
committed
CI: Use the ubuntu-latest runner
and use the default versions of gcc and clang.
1 parent 4383b1c commit 9811d13

File tree

4 files changed

+23
-30
lines changed

4 files changed

+23
-30
lines changed

‎.github/workflows/autotools-gcc-9.yml renamed to ‎.github/workflows/autotools-clang.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CI: autotools: gcc 9"
1+
name: "Autotools: clang"
22

33
on: [push]
44

@@ -9,18 +9,17 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v1
12-
- uses: docker://ubuntu:19.10
1312
- name: Build
1413
run: |
1514
sudo apt update
16-
sudo apt install libxml2-dev libglibmm-2.4-dev mm-common g++-9 docbook-xsl
17-
export CXX=g++-9
15+
sudo apt install libxml2-dev libglibmm-2.4-dev mm-common clang docbook-xsl
16+
export CXX=clang++
1817
./autogen.sh --enable-warnings=fatal
1918
make
2019
- name: Test
2120
run: make check
2221
- name: Distcheck
2322
run: |
2423
# distcheck runs configure again so we need to specify CXX again.
25-
export CXX=g++-9
24+
export CXX=clang++
2625
make distcheck

‎.github/workflows/autotools-clang-9.yml renamed to ‎.github/workflows/autotools-gcc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
name: "CI: autotools: clang 9"
1+
name: "Autotools: gcc"
22

33
on: [push]
44

55
jobs:
66
build:
77

8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99

1010
steps:
1111
- uses: actions/checkout@v1
1212
- name: Build
1313
run: |
1414
sudo apt update
15-
sudo apt install libxml2-dev libglibmm-2.4-dev mm-common clang-9 docbook-xsl
16-
export CXX=clang++-9
15+
sudo apt install libxml2-dev libglibmm-2.4-dev mm-common g++ docbook-xsl
16+
export CXX=g++
1717
./autogen.sh --enable-warnings=fatal
1818
make
1919
- name: Test
2020
run: make check
2121
- name: Distcheck
2222
run: |
2323
# distcheck runs configure again so we need to specify CXX again.
24-
export CXX=clang++-9
24+
export CXX=g++
2525
make distcheck

‎.github/workflows/meson-gcc-10.yml renamed to ‎.github/workflows/meson-clang.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: "meson: gcc 10"
1+
name: "Meson: clang"
22

33
on: [push]
44

55
jobs:
66
build:
77

8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99

1010
steps:
1111
- uses: actions/checkout@v1
@@ -14,12 +14,9 @@ jobs:
1414
# Prevent blocking apt install on a question during configuring of tzdata.
1515
export DEBIAN_FRONTEND=noninteractive
1616
sudo apt update
17-
sudo apt install libxml2-dev libxml2-utils docbook5-xml docbook-xsl libglibmm-2.4-dev mm-common g++-10 ninja-build python3-setuptools python3-pip --yes
18-
# Ubuntu 20.04 contains meson 0.53.2, but libxml++ requires meson >= 0.55.0.
19-
# Install it with pip3 instead of apt.
20-
sudo pip3 install "meson>=0.55.0"
21-
export CC=gcc-10
22-
export CXX=g++-10
17+
sudo apt install libxml2-dev libxml2-utils docbook5-xml docbook-xsl libglibmm-2.4-dev mm-common clang meson ninja-build python3-setuptools --yes
18+
export CC=clang
19+
export CXX=clang++
2320
meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
2421
cd _build
2522
meson compile
@@ -31,7 +28,7 @@ jobs:
3128
run: |
3229
sudo apt install git --yes
3330
# dist runs setup again so we need to specify CC and CXX again.
34-
export CC=gcc-10
35-
export CXX=g++-10
31+
export CC=clang
32+
export CXX=clang++
3633
cd _build
3734
meson dist

‎.github/workflows/meson-clang-10.yml renamed to ‎.github/workflows/meson-gcc.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: "meson: clang 10"
1+
name: "Meson: gcc"
22

33
on: [push]
44

55
jobs:
66
build:
77

8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99

1010
steps:
1111
- uses: actions/checkout@v1
@@ -14,12 +14,9 @@ jobs:
1414
# Prevent blocking apt install on a question during configuring of tzdata.
1515
export DEBIAN_FRONTEND=noninteractive
1616
sudo apt update
17-
sudo apt install libxml2-dev libxml2-utils docbook5-xml docbook-xsl libglibmm-2.4-dev mm-common clang-10 ninja-build python3-setuptools python3-pip --yes
18-
# Ubuntu 20.04 contains meson 0.53.2, but libxml++ requires meson >= 0.55.0.
19-
# Install it with pip3 instead of apt.
20-
sudo pip3 install "meson>=0.55.0"
21-
export CC=clang-10
22-
export CXX=clang++-10
17+
sudo apt install libxml2-dev libxml2-utils docbook5-xml docbook-xsl libglibmm-2.4-dev mm-common g++ meson ninja-build python3-setuptools --yes
18+
export CC=gcc
19+
export CXX=g++
2320
meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
2421
cd _build
2522
meson compile
@@ -31,7 +28,7 @@ jobs:
3128
run: |
3229
sudo apt install git --yes
3330
# dist runs setup again so we need to specify CC and CXX again.
34-
export CC=clang-10
35-
export CXX=clang++-10
31+
export CC=gcc
32+
export CXX=g++
3633
cd _build
3734
meson dist

0 commit comments

Comments
 (0)