diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2021-01-02 17:50:56 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2021-01-02 17:59:11 +0100 |
| commit | 70bf0b919ab2b76804d06c11b72fb0b928d4b102 (patch) | |
| tree | fcb12efb428b3c4bcb6a703577d7c570a71064a7 | |
| parent | 5a87d98dacdf0560e3b9ddc1023535ed170b6c32 (diff) | |
| download | sigc++-70bf0b919ab2b76804d06c11b72fb0b928d4b102.tar.gz | |
GitHub actions: Use ubuntu-20.04 directly
GitHub Actions now supports ubuntu-20.04 directly, not only via a
separate container:
https://github.com/actions/virtual-environments
And use ubuntu-18.04 instead of ubuntu-latest, because that's what it
currently is, but ubuntu-latest will change to mean ubuntu-20.04 soon:
https://github.com/actions/virtual-environments/issues/1816
| -rw-r--r-- | .github/workflows/autotools-clang-8.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/autotools-clang-9.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/meson-clang-10.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/meson-gcc-9.yml | 9 |
4 files changed, 12 insertions, 15 deletions
diff --git a/.github/workflows/autotools-clang-8.yml b/.github/workflows/autotools-clang-8.yml index 3048775..78914b5 100644 --- a/.github/workflows/autotools-clang-8.yml +++ b/.github/workflows/autotools-clang-8.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/autotools-clang-9.yml b/.github/workflows/autotools-clang-9.yml index c91cb93..b9b2f5c 100644 --- a/.github/workflows/autotools-clang-9.yml +++ b/.github/workflows/autotools-clang-9.yml @@ -5,8 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-latest - container: ubuntu:20.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 @@ -14,8 +13,8 @@ jobs: run: | # Prevent blocking apt install on a question during configuring of tzdata. export ENV DEBIAN_FRONTEND=noninteractive - apt update - apt install mm-common clang-9 make --yes + sudo apt update + sudo apt install mm-common clang-9 make --yes export CC=clang-9 CXX=clang++-9 ./autogen.sh --enable-warnings=fatal make diff --git a/.github/workflows/meson-clang-10.yml b/.github/workflows/meson-clang-10.yml index cc67450..af19f31 100644 --- a/.github/workflows/meson-clang-10.yml +++ b/.github/workflows/meson-clang-10.yml @@ -5,8 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-latest - container: ubuntu:20.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 @@ -14,8 +13,8 @@ jobs: 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 + sudo apt update + sudo apt install mm-common clang-10 meson ninja-build python3-setuptools --yes export CXX=clang++-10 meson -Dwarnings=fatal _build cd _build @@ -28,7 +27,7 @@ jobs: meson test - name: Dist run: | - apt install git --yes + sudo apt install git --yes # dist runs setup again so we need to specify CXX again. export CXX=clang++-10 cd _build diff --git a/.github/workflows/meson-gcc-9.yml b/.github/workflows/meson-gcc-9.yml index 864f8af..f472d97 100644 --- a/.github/workflows/meson-gcc-9.yml +++ b/.github/workflows/meson-gcc-9.yml @@ -5,8 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-latest - container: ubuntu:20.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 @@ -14,8 +13,8 @@ jobs: 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 + sudo apt update + sudo apt install mm-common g++-9 meson ninja-build python3-setuptools --yes export CXX=g++-9 meson -Dwarnings=fatal _build cd _build @@ -28,7 +27,7 @@ jobs: meson test - name: Dist run: | - apt install git --yes + sudo apt install git --yes # dist runs setup again so we need to specify CXX again. export CXX=g++-9 cd _build |