diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16da97d45a170ec93555f7b43fa29cc13a596d6c..207a4ef4d503952b93df282fdc1ed941c001ca0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,12 +64,16 @@ deploy-snapshot: - export VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - if ! [[ $VERSION =~ .*SNAPSHOT ]]; then exit 1; fi - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests + - echo "VERSION=$VERSION" >> build.env + artifacts: + reports: + dotenv: build.env tags: - vips-java rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' -# Runs after new SNAPSHOT is deployed to package registry. Triggers job on release branch in model repo, +# Runs after new SNAPSHOT is deployed to package registry. Triggers job on main branch in model repo, # which builds model with the new version of VIPSCommon. This pipeline fails if model build fails. verify_model_ALTERNARIA: @@ -77,10 +81,11 @@ verify_model_ALTERNARIA: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -89,10 +94,11 @@ verify_model_APPLESCABM: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -101,10 +107,11 @@ verify_model_BARLEYNETB: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -113,10 +120,11 @@ verify_model_BREMIALACT: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -125,10 +133,11 @@ verify_model_DELIARADIC: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -137,10 +146,11 @@ verify_model_DELIARFOBS: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -149,10 +159,11 @@ verify_model_DOWNCASTMO: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -161,10 +172,11 @@ verify_model_FAWMODEL01: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -173,10 +185,11 @@ verify_model_FINNCEREAL: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -185,10 +198,11 @@ verify_model_GRASSDRYMO: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -197,10 +211,11 @@ verify_model_LEAFBLOTCH: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -209,10 +224,11 @@ verify_model_LYGUSRUGUL: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -221,10 +237,11 @@ verify_model_MAIZEPHENO: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -233,10 +250,11 @@ verify_model_MAMESTRABR: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -245,10 +263,11 @@ verify_model_NAERSTADMO: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -257,10 +276,11 @@ verify_model_NEGPROGMOD: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -269,10 +289,11 @@ verify_model_OATFLOWERM: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -281,10 +302,11 @@ verify_model_PSILAROBSE: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -293,10 +315,11 @@ verify_model_PSILARTEMP: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -305,10 +328,11 @@ verify_model_ROUGHAGENU: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -317,10 +341,11 @@ verify_model_SEPAPIICOL: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -329,10 +354,11 @@ verify_model_SEPTORIAHU: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -341,10 +367,11 @@ verify_model_SEPTREFHUM: image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 $RELEASE_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify" tags: - vips-java + dependencies: + - deploy-snapshot rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' @@ -383,22 +410,28 @@ deploy-release: - git reset --hard origin/$MAIN_BRANCH - git merge -m "[ci skip] Merge ${RELEASE_BRANCH}" --no-ff $RELEASE_BRANCH - git push origin $MAIN_BRANCH + + - echo "VERSION=$RELEASE_VERSION" >> build.env + artifacts: + reports: + dotenv: build.env tags: - vips-java rules: - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' # Runs after new release is deployed to package registry. Triggers job on main branch in model repo, -# which builds model with the new version of VIPSCommon, and release a new snapshot version of the model. +# which builds model with the new version of VIPSCommon, and releases a new snapshot version of the model. update_model_ALTERNARIA: stage: models-1 image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 - - 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 VERSION=$RELEASE_VERSION -e PURPOSE="update" + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" tags: - vips-java + dependencies: + - deploy-release rules: - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' diff --git a/pom.xml b/pom.xml index 939f29f88283544d46d5d297397fc1389c3e1b8f..6a5345043c013a93e1407074f9d33ae5b76f85d6 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.7</version> + <version>2.0.10-SNAPSHOT</version> <packaging>jar</packaging> <name>VIPSCommon</name>