diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9b66d8b15bf8b08fdfc05c59c7aad821f264931..8a37876249b513e66993553cde15e5e4a7023972 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 48f1ff46c268828f7c7aba18fca4b6824f3460a1..1fafdb14e6010af678a0ab9e8d42c0d564e63428 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 909fca73c343468a25475a043d5e03ca356550cf..1c4dba180c7eb18acb7c959cb64271b53da6458b 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