Skip to content

Commit 058200d

Browse files
committed
CI: Install meson >= 0.62
* .github/workflows/meson-clang.yml: * .github/workflows/meson-gcc.yml: * .github/workflows/publish-docs.yml: Install meson with pip instead of apt.
1 parent b9ffaef commit 058200d

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

.github/workflows/meson-clang.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# 2024-07-19: ubuntu-latest = ubuntu-22.04
2+
# See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
13
name: "Meson: clang"
24

35
on: [push]
@@ -14,7 +16,10 @@ jobs:
1416
# Prevent blocking apt install on a question during configuring of tzdata.
1517
export ENV DEBIAN_FRONTEND=noninteractive
1618
sudo apt update
17-
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common clang meson ninja-build python3-setuptools --yes
19+
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common clang ninja-build python3-setuptools python3-pip --yes
20+
# Ubuntu 22.04 contains meson 0.61.2, but libsigc++ requires meson >= 0.62.0.
21+
# Install it with pip instead of apt.
22+
sudo pip install "meson>=0.62.0"
1823
export CXX=clang++
1924
meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
2025
cd _build

.github/workflows/meson-gcc.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# 2024-07-19: ubuntu-latest = ubuntu-22.04
2+
# See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
13
name: "Meson: gcc"
24

35
on: [push]
@@ -14,7 +16,10 @@ jobs:
1416
# Prevent blocking apt install on a question during configuring of tzdata.
1517
export ENV DEBIAN_FRONTEND=noninteractive
1618
sudo apt update
17-
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ meson ninja-build python3-setuptools --yes
19+
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ ninja-build python3-setuptools python3-pip --yes
20+
# Ubuntu 22.04 contains meson 0.61.2, but libsigc++ requires meson >= 0.62.0.
21+
# Install it with pip instead of apt.
22+
sudo pip install "meson>=0.62.0"
1823
export CXX=g++
1924
meson setup -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
2025
cd _build

.github/workflows/publish-docs.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
name: Publish docs
77

8-
# 2023-07-28: ubuntu-latest = ubuntu-22.04
8+
# 2024-07-19: ubuntu-latest = ubuntu-22.04
9+
# See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
910
on:
1011
# Runs on pushes targeting the default branch
1112
push:
@@ -37,7 +38,10 @@ jobs:
3738
# Prevent blocking apt install on a question during configuring of tzdata.
3839
export ENV DEBIAN_FRONTEND=noninteractive
3940
sudo apt update
40-
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ meson ninja-build python3-setuptools python3-pip --yes
41+
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ ninja-build python3-setuptools python3-pip --yes
42+
# Ubuntu 22.04 contains meson 0.61.2, but libsigc++ requires meson >= 0.62.0.
43+
# Install it with pip instead of apt.
44+
sudo pip install "meson>=0.62.0"
4145
meson setup -Dbuild-documentation=true -Dbuild-examples=false -Dbuild-tests=false _build
4246
meson compile -C _build
4347
- name: Collect Documentation

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy