diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 207a4ef4d503952b93df282fdc1ed941c001ca0b..2dd50db0c0cd856a945ee4c36a6f74c279dcbd8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -409,8 +409,11 @@ deploy-release: - git checkout $MAIN_BRANCH - git reset --hard origin/$MAIN_BRANCH - git merge -m "[ci skip] Merge ${RELEASE_BRANCH}" --no-ff $RELEASE_BRANCH + - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS validate -DbumpPatch + - export SNAPSHOT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") + - git add pom.xml + - git commit -m "[ci skip] Set snapshot version ${SNAPSHOT_VERSION}" - git push origin $MAIN_BRANCH - - echo "VERSION=$RELEASE_VERSION" >> build.env artifacts: reports: @@ -435,3 +438,289 @@ update_model_ALTERNARIA: - deploy-release rules: - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_APPLESCABM: + stage: models-1 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_BARLEYNETB: + stage: models-1 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_BREMIALACT: + stage: models-2 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_DELIARADIC: + stage: models-2 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_DELIARFOBS: + stage: models-2 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_DOWNCASTMO: + stage: models-3 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_FAWMODEL01: + stage: models-3 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_FINNCEREAL: + stage: models-3 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_GRASSDRYMO: + stage: models-4 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_LEAFBLOTCH: + stage: models-4 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_LYGUSRUGUL: + stage: models-4 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_MAIZEPHENO: + stage: models-5 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_MAMESTRABR: + stage: models-5 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_NAERSTADMO: + stage: models-5 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_NEGPROGMOD: + stage: models-6 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_OATFLOWERM: + stage: models-6 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_PSILAROBSE: + stage: models-6 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_PSILARTEMP: + stage: models-7 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_ROUGHAGENU: + stage: models-7 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_SEPAPIICOL: + stage: models-7 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_SEPTORIAHU: + stage: models-8 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + +update_model_SEPTREFHUM: + stage: models-8 + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update" + tags: + - vips-java + dependencies: + - deploy-release + rules: + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' \ No newline at end of file diff --git a/pom.xml b/pom.xml index e206f37efa51875a9e1844b246efb7f494e0bc66..25e742436dd28aa880eb5e4e2244d60068a194e5 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.11</version> + <version>2.0.12-SNAPSHOT</version> <packaging>jar</packaging> <name>VIPSCommon</name>