From 7a3a4b7d5067937b7e903d7b6a9bb30cfcd24a85 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Mon, 31 Aug 2020 09:25:22 +0300 Subject: [PATCH] Test CI_COMMIT_REF_NAME gitlab #79 --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 473d3853..ee2765ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,9 @@ variables: MAVEN_CLI_OPTS: "--show-version" BUNDLED_JRE_VERSION: jre11-hotspot PUBLISH_ADDRESS: www.simantics.org - PUBLISH_BASE_DIR: /var/www/http-www.simantics.org/download/${CI_COMMIT_REF_NAME}/sysdyn - PUBLISH_P2_DIR: ${PUBLISH_BASE_DIR}/p2.site - PUBLISH_PRODUCT_DIR: ${PUBLISH_BASE_DIR}/products + PUBLISH_BASE_DIR: "/var/www/http-www.simantics.org/download/${CI_COMMIT_REF_NAME}/sysdyn" + PUBLISH_P2_DIR: "${PUBLISH_BASE_DIR}/p2.site" + PUBLISH_PRODUCT_DIR: "${PUBLISH_BASE_DIR}/products" image: registry.simupedia.com/ci-images/maven-eclipse-adoptopenjdk-11:latest @@ -41,6 +41,9 @@ review: build: stage: build script: + - export + - echo "${PUBLISH_P2_DIR}" + - echo "${PUBLISH_PRODUCT_DIR}" - mvn ${MAVEN_CLI_OPTS} -B clean verify -Dbuild-products=true - curl -s http://www.simantics.org/download/jre/$BUNDLED_JRE_VERSION.zip -o $BUNDLED_JRE_VERSION.zip - 7z x -bd $BUNDLED_JRE_VERSION.zip @@ -100,9 +103,8 @@ publish-installer: before_script: - *initialize_ssh_connection script: - - echo "${PUBLISH_PRODUCT_DIR}" - #- ssh -i $GITLAB_PRIVATE_KEY $GITLAB_USERNAME@$PUBLISH_ADDRESS mkdir -p "${PUBLISH_PRODUCT_DIR}" - #- rsync -e "ssh -i $GITLAB_PRIVATE_KEY" -v *.exe $GITLAB_USERNAME@$PUBLISH_ADDRESS:${PUBLISH_PRODUCT_DIR}/ + - ssh -i $GITLAB_PRIVATE_KEY $GITLAB_USERNAME@$PUBLISH_ADDRESS mkdir -p "${PUBLISH_PRODUCT_DIR}" + - rsync -e "ssh -i $GITLAB_PRIVATE_KEY" -v *.exe $GITLAB_USERNAME@$PUBLISH_ADDRESS:${PUBLISH_PRODUCT_DIR}/ rules: - when: manual -- 2.47.1