diff options
| author | Thomas Lenz <thomas.lenz@iaik.tugraz.at> | 2023-09-04 07:08:18 +0000 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@iaik.tugraz.at> | 2023-09-04 07:08:18 +0000 |
| commit | fecd2fa23e50e6fc0d851eddc0b079ee44131066 (patch) | |
| tree | 4e040a63dccd4d36fd362c7ea097cd1228585078 | |
| parent | 134b5a78d805a75895bd6d099397c7b6b5d093fb (diff) | |
| parent | 9c5bc97110716ba58952a711606d6f14ac2093f9 (diff) | |
| download | EAAF-Components-fecd2fa23e50e6fc0d851eddc0b079ee44131066.tar.gz EAAF-Components-fecd2fa23e50e6fc0d851eddc0b079ee44131066.tar.bz2 EAAF-Components-fecd2fa23e50e6fc0d851eddc0b079ee44131066.zip | |
Merge branch 'feature/java_17' into '2.x/development'
build(ci): update deploy step, because 'ssh-keyscan' isn't available in latest maven images
See merge request egiz/eaaf_components!24
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92770ec6..34ebc521 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: LIB_NAME: "eaaf-components" MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true --settings ${CI_PROJECT_DIR}/.cisettings.xml" MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${CI_PROJECT_DIR}/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + DEPLOY_EGIZ: "apps.egiz.gv.at ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFyPUwab/Ipmc9NxI+c2i0fzLcIilh3uNebUyUYKFm04bW+aGHuwtsmAka5T3amQA0ADVMTGPWk1JGW0D0dgvXVcU8yYKYw61imKHBiPIdRNh9zVV/p5iL6bCK3AZ0UoZFfeIRNWNfKA6XGJ5e9i2DD1H8BllFOsWeUUYA8GA4tN2j8vL/dZnMcYmbisaUPuCjd7TGnbp+CcRO/f9w87qU/vp2fTG+sNBApuSR18BinUerSK9YK5qLgHxmVeIDtALq1JD5OGacvnTfAczfwSOf37+jtRzpMicGQOBQztoqfifPDAKrr6tYPrQ/pS4PKM/MnhYlvSwQa5h046REFXrx" GIT_SUBMODULE_STRATEGY: recursive GIT_DEPTH: "2" SECURE_LOG_LEVEL: "debug" @@ -90,7 +91,8 @@ publishToGitlab: - /^feature/.*$/i before_script: - mkdir -p ~/.ssh - - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts + #- ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts + - echo $DEPLOY_EGIZ >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts script: | export VERSION=$(mvn -B help:evaluate -Dexpression=project.version -B | grep -v "\[INFO\]" | grep -Po "\d+\.\d+\.\d+((-\w*)+)?") |