From e05fb7b3e36c052baf0dd607ddeb22c0a2b5cbde Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 19:47:04 +0200 Subject: Adding upstream version 43.2. Signed-off-by: Daniel Baumann --- build-aux/maintainer-upload-release | 37 +++++++++++++++++++++++++++++++++++++ build-aux/meson.build | 4 ++++ 2 files changed, 41 insertions(+) create mode 100755 build-aux/maintainer-upload-release create mode 100644 build-aux/meson.build (limited to 'build-aux') diff --git a/build-aux/maintainer-upload-release b/build-aux/maintainer-upload-release new file mode 100755 index 0000000..a5ca951 --- /dev/null +++ b/build-aux/maintainer-upload-release @@ -0,0 +1,37 @@ +#!/bin/bash +set -ex +: "${MESON_BUILD_ROOT:?}" +: "${MESON_SOURCE_ROOT:?}" +project_name="${1:?project name is required}" +project_version="${2:?project version is required}" +tarball_basename="${project_name}-${project_version}.tar.xz" +tarball_path="${MESON_BUILD_ROOT}/meson-dist/${tarball_basename}" +[[ -e "$tarball_path" ]] # ninja dist must have been successful + +gnome_series=${project_version%.*} +expected_branch=gnome-${gnome_series/./-} + +pushd "$MESON_SOURCE_ROOT" + branch=$(git rev-parse --abbrev-ref HEAD) + if [[ "$branch" != "master" ]] && [[ "$branch" != "$expected_branch" ]]; then + echo "Project version $project_version does not match branch $branch" >&2 + exit 1 + fi + if git show-ref --tags "$project_version" --quiet; then + # Tag already exists; verify that it points to HEAD + [ "$(git rev-parse "$project_version"^{})" = "$(git rev-parse HEAD)" ] + else + if type git-evtag &>/dev/null; then + # Can't specify tag message on command line + # https://github.com/cgwalters/git-evtag/issues/9 + EDITOR=true git evtag sign "$project_version" + else + git tag -s "$project_version" -m "Version $project_version" + fi + fi + git push --atomic origin "$branch" "$project_version" +popd + +scp "$tarball_path" master.gnome.org: +# shellcheck disable=SC2029 +ssh -t master.gnome.org ftpadmin install "$tarball_basename" diff --git a/build-aux/meson.build b/build-aux/meson.build new file mode 100644 index 0000000..ab4cbea --- /dev/null +++ b/build-aux/meson.build @@ -0,0 +1,4 @@ +run_target('maintainer-upload-release', + command: ['maintainer-upload-release', + meson.project_name(), + meson.project_version()]) -- cgit v1.2.3