Skip to content
Snippets Groups Projects
Commit a06c0f86 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

Merge branch 'main' into release

parents 6f559db6 cf7588ce
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 25
− 25
View file @ a06c0f86
...@@ -69,7 +69,7 @@ deploy-snapshot: ...@@ -69,7 +69,7 @@ deploy-snapshot:
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
# Runs after new SNAPSHOT is deployed to package registry. Triggers job on main branch in model repo, # Runs after new SNAPSHOT is deployed to package registry. Triggers job on release branch in model repo,
# which builds model with the new version of VIPSCommon. This pipeline fails if model build fails. # which builds model with the new version of VIPSCommon. This pipeline fails if model build fails.
verify_model_ALTERNARIA: verify_model_ALTERNARIA:
...@@ -78,7 +78,7 @@ verify_model_ALTERNARIA: ...@@ -78,7 +78,7 @@ verify_model_ALTERNARIA:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $RELEASE_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -90,7 +90,7 @@ verify_model_APPLESCABM: ...@@ -90,7 +90,7 @@ verify_model_APPLESCABM:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $RELEASE_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -102,7 +102,7 @@ verify_model_BARLEYNETB: ...@@ -102,7 +102,7 @@ verify_model_BARLEYNETB:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $RELEASE_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -114,7 +114,7 @@ verify_model_BREMIALACT: ...@@ -114,7 +114,7 @@ verify_model_BREMIALACT:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $RELEASE_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -126,7 +126,7 @@ verify_model_DELIARADIC: ...@@ -126,7 +126,7 @@ verify_model_DELIARADIC:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $RELEASE_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -138,7 +138,7 @@ verify_model_DELIARFOBS: ...@@ -138,7 +138,7 @@ verify_model_DELIARFOBS:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $RELEASE_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -150,7 +150,7 @@ verify_model_DOWNCASTMO: ...@@ -150,7 +150,7 @@ verify_model_DOWNCASTMO:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $RELEASE_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -162,7 +162,7 @@ verify_model_FAWMODEL01: ...@@ -162,7 +162,7 @@ verify_model_FAWMODEL01:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $RELEASE_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -174,7 +174,7 @@ verify_model_FINNCEREAL: ...@@ -174,7 +174,7 @@ verify_model_FINNCEREAL:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $RELEASE_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -186,7 +186,7 @@ verify_model_GRASSDRYMO: ...@@ -186,7 +186,7 @@ verify_model_GRASSDRYMO:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $RELEASE_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -198,7 +198,7 @@ verify_model_LEAFBLOTCH: ...@@ -198,7 +198,7 @@ verify_model_LEAFBLOTCH:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $RELEASE_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -210,7 +210,7 @@ verify_model_LYGUSRUGUL: ...@@ -210,7 +210,7 @@ verify_model_LYGUSRUGUL:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $RELEASE_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -222,7 +222,7 @@ verify_model_MAIZEPHENO: ...@@ -222,7 +222,7 @@ verify_model_MAIZEPHENO:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $RELEASE_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -234,7 +234,7 @@ verify_model_MAMESTRABR: ...@@ -234,7 +234,7 @@ verify_model_MAMESTRABR:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $RELEASE_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -246,7 +246,7 @@ verify_model_NAERSTADMO: ...@@ -246,7 +246,7 @@ verify_model_NAERSTADMO:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $RELEASE_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -258,7 +258,7 @@ verify_model_NEGPROGMOD: ...@@ -258,7 +258,7 @@ verify_model_NEGPROGMOD:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $RELEASE_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -270,7 +270,7 @@ verify_model_OATFLOWERM: ...@@ -270,7 +270,7 @@ verify_model_OATFLOWERM:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $RELEASE_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -282,7 +282,7 @@ verify_model_PSILAROBSE: ...@@ -282,7 +282,7 @@ verify_model_PSILAROBSE:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $RELEASE_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -294,7 +294,7 @@ verify_model_PSILARTEMP: ...@@ -294,7 +294,7 @@ verify_model_PSILARTEMP:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $RELEASE_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -306,7 +306,7 @@ verify_model_ROUGHAGENU: ...@@ -306,7 +306,7 @@ verify_model_ROUGHAGENU:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $RELEASE_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -318,7 +318,7 @@ verify_model_SEPAPIICOL: ...@@ -318,7 +318,7 @@ verify_model_SEPAPIICOL:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $RELEASE_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -330,7 +330,7 @@ verify_model_SEPTORIAHU: ...@@ -330,7 +330,7 @@ verify_model_SEPTORIAHU:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $RELEASE_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -342,7 +342,7 @@ verify_model_SEPTREFHUM: ...@@ -342,7 +342,7 @@ verify_model_SEPTREFHUM:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$PROJECT_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $RELEASE_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
...@@ -397,7 +397,7 @@ update_model_ALTERNARIA: ...@@ -397,7 +397,7 @@ update_model_ALTERNARIA:
script: script:
- apk add --no-cache openjdk11 - apk add --no-cache openjdk11
- export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e RELEASE_VERSION=$RELEASE_VERSION - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$RELEASE_VERSION
tags: tags:
- vips-java - vips-java
rules: rules:
......
pom.xml
+ 1
− 1
View file @ a06c0f86
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>2.0.5</version> <version>2.0.6-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>VIPSCommon</name> <name>VIPSCommon</name>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment