Skip to content

Commit 7070350

Browse files
kjellahlkjellahl
committed
CI: Use the ubuntu-latest runner
and use the default versions of gcc and clang.
1 parent d17a581 commit 7070350

File tree

7 files changed

+28
-32
lines changed

7 files changed

+28
-32
lines changed

‎.github/workflows/autotools-clang-10.yml renamed to ‎.github/workflows/autotools-clang.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: "CI: autotools: clang 10"
1+
name: "Autotools: 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,14 +14,14 @@ jobs:
1414
# Prevent blocking apt install on a question during configuring of tzdata.
1515
export ENV DEBIAN_FRONTEND=noninteractive
1616
sudo apt update
17-
sudo apt install mm-common clang-10 make docbook-xsl --yes
18-
export CC=clang-10 CXX=clang++-10
17+
sudo apt install mm-common clang make docbook-xsl --yes
18+
export CC=clang CXX=clang++
1919
./autogen.sh --enable-warnings=fatal
2020
make
2121
- name: Test
2222
run: make check
2323
- name: Distcheck
2424
run: |
2525
# distcheck runs configure again so we need to specify CC and CXX again.
26-
export CC=clang-10 CXX=clang++-10
26+
export CC=clang CXX=clang++
2727
make distcheck

‎.github/workflows/autotools-gcc-10.yml renamed to ‎.github/workflows/autotools-gcc.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
1-
name: "CI: autotools: gcc 10"
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: |
14+
# Prevent blocking apt install on a question during configuring of tzdata.
15+
export ENV DEBIAN_FRONTEND=noninteractive
1416
sudo apt update
15-
sudo apt install mm-common g++-10 docbook-xsl
16-
export CXX=g++-10
17+
sudo apt install mm-common g++ make docbook-xsl --yes
18+
export CXX=g++
1719
./autogen.sh --enable-warnings=fatal
1820
make
1921
- name: Test
2022
run: make check
2123
- name: Distcheck
2224
run: |
2325
# distcheck runs configure again so we need to specify CXX again.
24-
export CXX=g++-10
26+
export CXX=g++
2527
make distcheck

‎.github/workflows/clang-format-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CI: Check Code Formatting"
1+
name: "Check Code Formatting"
22

33
# Triggered manually
44
on: [workflow_dispatch]
@@ -15,5 +15,5 @@ jobs:
1515
# Prevent blocking the install on a question during configuring of tzdata.
1616
export ENV DEBIAN_FRONTEND=noninteractive
1717
sudo apt update
18-
sudo apt install clang-format-12 --yes
19-
clang-format-12 --dry-run --Werror `find . -name "*.h" -or -name "*.cc"`
18+
sudo apt install clang-format --yes
19+
clang-format --dry-run --Werror `find . -name "*.h" -or -name "*.cc"`

‎.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CI: cmake"
1+
name: "CMake: gcc"
22

33
on: [push]
44

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

Lines changed: 5 additions & 8 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,11 +14,8 @@ jobs:
1414
# Prevent blocking apt install on a question during configuring of tzdata.
1515
export ENV DEBIAN_FRONTEND=noninteractive
1616
sudo apt update
17-
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++-10 ninja-build python3-setuptools python3-pip --yes
18-
# Ubuntu 20.04 contains meson 0.53.2, but libsigc++ requires meson >= 0.55.0.
19-
# Install it with pip3 instead of apt.
20-
sudo pip3 install "meson>=0.55.0"
21-
export CXX=g++-10
17+
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common clang meson ninja-build python3-setuptools --yes
18+
export CXX=clang++
2219
meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
2320
cd _build
2421
meson compile
@@ -30,6 +27,6 @@ jobs:
3027
run: |
3128
sudo apt install git --yes
3229
# dist runs setup again so we need to specify CXX again.
33-
export CXX=g++-10
30+
export CXX=clang++
3431
cd _build
3532
meson dist

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

Lines changed: 5 additions & 8 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,11 +14,8 @@ jobs:
1414
# Prevent blocking apt install on a question during configuring of tzdata.
1515
export ENV DEBIAN_FRONTEND=noninteractive
1616
sudo apt update
17-
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common clang-10 ninja-build python3-setuptools python3-pip --yes
18-
# Ubuntu 20.04 contains meson 0.53.2, but libsigc++ requires meson >= 0.55.0.
19-
# Install it with pip3 instead of apt.
20-
sudo pip3 install "meson>=0.55.0"
21-
export CXX=clang++-10
17+
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ meson ninja-build python3-setuptools --yes
18+
export CXX=g++
2219
meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
2320
cd _build
2421
meson compile
@@ -30,6 +27,6 @@ jobs:
3027
run: |
3128
sudo apt install git --yes
3229
# dist runs setup again so we need to specify CXX again.
33-
export CXX=clang++-10
30+
export CXX=g++
3431
cd _build
3532
meson dist

‎.github/workflows/publish-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# Copied from https://github.com/libsigcplusplus/libsigcplusplus/actions/new
44
# and changed. Actions -> New workflow -> Pages -> GitHub Pages Jekyll
55

6-
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
6+
name: Publish docs
77

8-
# 2022-12-17: ubuntu-latest = ubuntu-22.04
8+
# 2023-07-28: ubuntu-latest = ubuntu-22.04
99
on:
1010
# Runs on pushes targeting the default branch
1111
push:

0 commit comments

Comments
 (0)