From 0cc4d1d6e0700fc242fbc3f7f497a929cc6bdd4b Mon Sep 17 00:00:00 2001
From: Lene Wasskog <lene.wasskog@nibio.no>
Date: Wed, 28 May 2025 11:13:27 +0200
Subject: [PATCH] chore: Upgrade vips-parent-pom, minor pipeline fix
---
.gitlab-ci.yml | 4 +---
pom.xml | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e352ad..9b96d26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,9 +54,7 @@ before_script:
- git config --global user.email "${GITLAB_USER_EMAIL}"
- echo "Get common settings"
- git clone --depth=1 "$COMMON_CONFIG_REMOTE" "$COMMON_CONFIG_LOCAL"
- - cd $COMMON_CONFIG_LOCAL
- - cp $SETTINGS_XML ../$SETTINGS_XML
- - cd ..
+ - cp $COMMON_CONFIG_LOCAL/$SETTINGS_XML ./$SETTINGS_XML
- rm -rf $COMMON_CONFIG_LOCAL
build:
diff --git a/pom.xml b/pom.xml
index 0574f54..0e4d839 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>no.nibio.vips</groupId>
<artifactId>vips-parent-pom</artifactId>
- <version>1.1.0</version>
+ <version>1.1.3</version>
</parent>
<artifactId>VIPSCommon</artifactId>
--
GitLab