From 30859244c9598068402f42597ca8a37659fdc05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Sch=C3=B6ne?= <rene.schoene@tu-dresden.de>
Date: Thu, 16 Apr 2020 13:14:38 +0000
Subject: [PATCH] Resolve "Creation of jar in CI fails"

- Setting archiveBaseName for task jar.
---
 .gitlab-ci.yml                              | 33 +++------------------
 README.md                                   |  6 ++--
 build.gradle                                |  2 ++
 src/main/resources/RelASTVersion.properties |  4 +--
 4 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6bf485..dfad4ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,43 +1,18 @@
 stages:
 - build
 - test
-- jar
 
 build:
   image: openjdk:8
   stage: build
   script:
-    - ./gradlew --console=plain --build-cache assemble
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: push
+    - ./gradlew --console=plain assemble jar
+  artifacts:
     paths:
-      - build
-      - .gradle
+      - "/builds/jastadd/relational-rags/build/libs/relast-*.jar"
 
 test:
   image: openjdk:8
   stage: test
   script:
-    - ./gradlew --continue --console=plain --info check
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - build
-      - .gradle
-
-jar:
-  image: openjdk:8
-  stage: jar
-  script:
-    - ./gradlew --continue --console=plain --info jar
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - build
-      - .gradle
-  artifacts:
-    paths:
-      - "/builds/jastadd/*/build/libs/*relast*.jar"
+    - ./gradlew --console=plain --info test
diff --git a/README.md b/README.md
index da4ab0d..b49c377 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-[![pipeline status](/../badges/master/pipeline.svg)](/../pipelines)
-
-# RelAST Preprocessor Version 0.2.4
+# RelAST Preprocessor
 
 ![RelAST process](relast-process.png)
 
+See [releases page](/../../releases) for the latest version.
+
 The RelAST preprocessor takes a `.relast` file as input comprising AST rules and relations. It produces files that afterwards are processed by JastAdd to generated Java code.
 To use it in your project, build the JAR file running
 
diff --git a/build.gradle b/build.gradle
index 068c1f6..58840b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,6 +74,8 @@ jar {
     from {
         configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
     }
+
+    archiveBaseName = 'relast'
 }
 
 jastadd {
diff --git a/src/main/resources/RelASTVersion.properties b/src/main/resources/RelASTVersion.properties
index 303d396..909fca7 100644
--- a/src/main/resources/RelASTVersion.properties
+++ b/src/main/resources/RelASTVersion.properties
@@ -1,2 +1,2 @@
-#Thu Jan 16 09:42:49 CET 2020
-version=0.2.4-28-g22c4762
+#Thu Apr 16 11:22:48 CEST 2020
+version=0.3.0
-- 
GitLab