From 7f2f97a58696dec8c422a5782469e86bcf81746f Mon Sep 17 00:00:00 2001
From: Eduard Frankford <e.frankford@student.uibk.ac.at>
Date: Thu, 12 May 2022 13:35:26 +0200
Subject: [PATCH] test
---
.gitlab-ci.yml | 25 ++++++++++++++++---------
package.json | 2 +-
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f0164f75..bc7954b6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,13 +117,20 @@ maven-package:
- target/classes
expire_in: 15 days
# Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
- #docker-push:
- # stage: release
- # variables:
- # REGISTRY_URL: registry.gitlab.com
- # IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
- # dependencies:
- # - maven-package
- # script:
- # - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
+docker-push:
+ stage: release
+ variables:
+ REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
+ IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
+ # USERNAME: root
+ # PASSWORD: dgL5n2bqawsFnfQrwgHp
+ dependencies:
+ - maven-package
+ script:
+ - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
+ - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
+ artifacts:
+ paths:
+ - target/*.jar
+ - target/classes
when: manual
diff --git a/package.json b/package.json
index 8ba0f6ff9..f6a7216bf 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
"lodash": "^4.17.21",
"moment": "^2.29.1",
"ngx-cookie-service": "^13.1.2",
- "ngx-infinite-scroll": "10.0.1",
+ "ngx-infinite-scroll": "^10.0.1",
"ngx-markdown": "^13.0.0",
"ngx-webstorage": "9.0.0",
"rxjs": "^7.5.2",
--
GitLab