diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..6d3ee52e70e84a3a2cd506b91ad3e72d8b355f0e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,27 @@ +variables: + GIT_SUBMODULE_STRATEGY: recursive + +stages: + - build + - test + +build: + image: openjdk:8 + stage: build + script: + # see discussion in the answer of https://stackoverflow.com/questions/44911155/gradle-how-to-include-runtimeonly-dependencies-in-javaexec-classpath + - ./gradlew --console=plain --no-daemon relast.preprocessor:jar + - ./gradlew --console=plain --no-daemon assemble jar + artifacts: + paths: + - build/libs/*.jar + + +test: + image: openjdk:8 + stage: test + script: + - ./gradlew --console=plain --no-daemon check + artifacts: + reports: + junit: build/test-results/test/**/TEST-*.xml diff --git a/.gitmodules b/.gitmodules index 0b4428b1fc31ec1dae055a965c418f6098c9ad84..ef6ee67ef918ae615118351e1223fe4ceddf6f4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "relast.preprocessor"] path = relast.preprocessor - url = git@git-st.inf.tu-dresden.de:jastadd/relast-preprocessor.git + url = ../../relast-preprocessor.git diff --git a/build.gradle b/build.gradle index 64900db355652ef9ac8a83c7604eed3a89935ac9..3ea5c7de642dad321846f4171e0f9fc46378ebe6 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,8 @@ dependencies { testImplementation testFixtures(project(":relast.preprocessor")) } +project.version = "0.2.0" + sourceSets { main { java.srcDir "src/gen/java" diff --git a/relast.preprocessor b/relast.preprocessor index aeb1e3f9676705f3a05a54bbce175151825b0d7e..12668fd8c2e4eee20000d1e7b43b2d4d17c59d45 160000 --- a/relast.preprocessor +++ b/relast.preprocessor @@ -1 +1 @@ -Subproject commit aeb1e3f9676705f3a05a54bbce175151825b0d7e +Subproject commit 12668fd8c2e4eee20000d1e7b43b2d4d17c59d45 diff --git a/settings.gradle b/settings.gradle index 6bd0d8458548eddd216943f6771be3fe81215c3d..cd071807d331316a515c88ce224a76993d8705a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ pluginManagement { } } -rootProject.name = 'preprocessor' +rootProject.name = 'abstract_type_navigation_generator' include 'relast.preprocessor'