From 8e16138c0b7d81d2980cdf97891a59583563c00e Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@gmail.com>
Date: Sun, 14 Apr 2024 18:35:43 +0200
Subject: [PATCH] ci: fix bumpversion regex + latest version
---
bumpversion.sh | 2 +-
templates/gitlab-ci-maven.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bumpversion.sh b/bumpversion.sh
index ed44d7b..329e866 100755
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -33,7 +33,7 @@ if [[ "$curVer" ]]; then
# replace in template and variants
for tmpl in templates/*.yml
do
- sed -e "s/command: *\[\"--service\", \"\(.*\)\", \"$curVer\"\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"
+ sed -e "s/command: *\[ *\"--service\", *\"\(.*\)\", *\"$curVer\" *\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"
mv -f "$tmpl.next" "$tmpl"
done
else
diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml
index d416622..180e94c 100644
--- a/templates/gitlab-ci-maven.yml
+++ b/templates/gitlab-ci-maven.yml
@@ -523,7 +523,7 @@ stages:
image: $MAVEN_IMAGE
services:
- name: "$TBC_TRACKING_IMAGE"
- command: ["--service", "maven", "3.8.0" ]
+ command: ["--service", "maven", "3.9.1"]
before_script:
- !reference [.mvn-scripts]
- install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
--
GitLab