From 697a290400d2ee5f148fdf3356683d0f436dd0ab Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 24 Mar 2021 13:01:51 +0100
Subject: GitLab CI update again

---
 .gitlab-ci.yml                  | 26 +++++++++++++++++++++++---
 moaSig/common/build.gradle      |  5 +++--
 moaSig/moa-sig-lib/build.gradle |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56f443c..c94aebb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,8 @@ variables:
   LANGUAGE: "en_US"
   LIB_NAME: "ms_specific"
   GIT_DEPTH: "2"
-  SECURE_LOG_LEVEL: "debug"
+  SECURE_LOG_LEVEL: "debug"  
+  PROJECT_PACKAGE: '${CI_PROJECT_DIR}/moaSig/moa-sig/build/distributions/*.zip'
   PROJECT_RELEASE_PACKAGE: "../release/"
   
 include:
@@ -16,7 +17,7 @@ include:
 stages:
   - assemble
   - test
-#  - package
+  - package
   - release
 
 cache:
@@ -33,13 +34,32 @@ assemble:
     - tags  
   script: |
     cd ./moaSig
-    ./gradlew clean assemble --warning-mode all 
+    ./gradlew clean build --warning-mode all 
   artifacts:
     when: always
 
+release_packaging:
+  stage: package
+  tags:
+    - docker    
+  except:
+    - tags  
+  script: |
+    cd ./moaSig
+    ./gradlew assemble
+  artifacts:
+    when: always
+    name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}"  
+    reports:
+      dotenv: variables.env    
+    paths:
+      - $PROJECT_PACKAGE
+    
 release:
   stage: release
   image: registry.gitlab.com/gitlab-org/release-cli:latest
+  tags:
+    - docker   
   needs:
     - job: assemble
       artifacts: true
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 5e9122b..7f5ee6d 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -14,10 +14,11 @@ task testJar(type: Jar, dependsOn: testClasses) {
 }
 
 configurations {
-    tests
+    testArtifacts.extendsFrom testCompile
 }
 
 artifacts {
-    archives testJar
+	testArtifacts testJar
+    //archives testJar
 }
 
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index bb1a8d3..6a62098 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -9,7 +9,7 @@ distributions {
 
 dependencies {	
 	implementation project(':common')	
-	testImplementation project(path: ':common')
+	testImplementation project(path: ':common', configuration: 'testArtifacts')
 	
 	api fileTree(dir: '../libs', include: '*.jar')
 	api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.0.4'
-- 
cgit v1.2.3