From d9bca63ab61ba4ef3b786a1d720ebd88c5ab3c73 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 13 Feb 2025 10:29:43 -0300 Subject: [PATCH] ci: Use meson introspection to fetch project version Seems a little less fragile than using the NEWS.md file directly. Suggested by Peter Hutterer. --- .github/workflows/Containerfile | 1 + .github/workflows/container.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Containerfile b/.github/workflows/Containerfile index ad7e899dc..7c0c6ec32 100644 --- a/.github/workflows/Containerfile +++ b/.github/workflows/Containerfile @@ -17,6 +17,7 @@ RUN apt install -y --no-install-recommends \ git \ gnome-desktop-testing \ gtk-doc-tools \ + jq \ libcap2-bin \ libflatpak-dev \ libfontconfig1-dev \ diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 7ecf61d3b..98d8c3b27 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -1,5 +1,5 @@ env: - IMAGE_TAG: 20241211-1 + IMAGE_TAG: 20250213-1 on: workflow_call: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3e81ee6f..f0a4cf994 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Extract release information run: | # Extract the release version - releaseVersion=`perl -0777nE 'print $& if /(?<=Changes in ).*/' NEWS.md` + releaseVersion=`meson introspect --projectinfo _build/ | jq -r .version` echo "releaseVersion=$releaseVersion" | tee -a $GITHUB_ENV echo $releaseVersion