From e6aebf057a49c9fa3987df4fc002159a7b128ed4 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 11 Mar 2022 17:40:29 +0100
Subject: [PATCH] 0.4.0
- always build package
- prepare for develop -> dev, master -> main
---
.gitlab-ci.yml | 16 ++++++++++++++--
build.gradle | 6 ------
src/main/resources/RelASTVersion.properties | 4 ++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9b66d8..8a37876 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,18 @@ pages:
- public
only:
- master
+ - main
+
+publish:
+ image: openjdk:8
+ stage: deploy
+ needs:
+ - test
+ script:
+ - "./gradlew publish"
+ only:
+ - master
+ - main
publish_dev:
image: openjdk:8
@@ -46,6 +58,6 @@ publish_dev:
script:
- "./gradlew setDevVersionForCI"
- "./gradlew publish"
- only:
- - develop
+ except:
- master
+ - main
diff --git a/build.gradle b/build.gradle
index 48f1ff4..1fafdb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,12 +117,6 @@ jastadd {
//noinspection GroovyAssignabilityCheck
module('RelAst') {
- java {
- basedir '.'
- include 'src/main/**/*.java'
- include 'src/gen/**/*.java'
- }
-
jastadd {
basedir 'src/main/jastadd/'
include '**/*.ast'
diff --git a/src/main/resources/RelASTVersion.properties b/src/main/resources/RelASTVersion.properties
index 909fca7..1c4dba1 100644
--- a/src/main/resources/RelASTVersion.properties
+++ b/src/main/resources/RelASTVersion.properties
@@ -1,2 +1,2 @@
-#Thu Apr 16 11:22:48 CEST 2020
-version=0.3.0
+#Fri Mar 11 17:24:51 CET 2022
+version=0.4.0
--
GitLab