From 95b50c873013ba1e158eb7dfdfb4d6536a8944bd Mon Sep 17 00:00:00 2001 From: Julian Rother <julian@cccv.de> Date: Tue, 4 Apr 2023 23:06:51 +0200 Subject: [PATCH] Adapt autoupdate to new upstream tag format --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6ef077..776823f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,9 +21,9 @@ autoupdate: - | git config --global user.email "infra+packages-autoupdate@cccv.de" git config --global user.name "autoupdater" - git -C ../upstream-checkout tag -l --sort=creatordate | sed -n -E \ - -e 's/^(release_stable_([0-9]{4})-([0-9]{2})-([0-9]{2}))$/\1 0.0.\2\3\4/p' \ - -e 's/^(release_stable_([0-9]{4})-([0-9]{2})-([0-9]{2})([a-z]*))$/\1 0.0.\2\3\4.\5/p' \ + git -C ../upstream-checkout tag -l --sort=creatordate | grep -v 'rc$' | sed -n -E \ + -e 's/^(release-([0-9]{4})-([0-9]{2})-([0-9]{2}))$/\1 0.0.\2\3\4/p' \ + -e 's/^(release-([0-9]{4})-([0-9]{2})-([0-9]{2})([a-z]*))$/\1 0.0.\2\3\4.\5/p' \ | tail -n 3 | while read upstream_version debian_version; do if [ "$(git tag -l "v$debian_version")" == "" ]; then printf "variables:\n UPSTREAM_VERSION: ${upstream_version}" > gitlabci-version.yml -- GitLab