diff --git a/.gitignore b/.gitignore index 4d6556c..908c0d9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.war *.ear /bin +*/.settings/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8585983..565b880 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ -image: gcc:latest stages: - build build-c: + image: archlinux_gcc53_qt5_cmake stage: build script: - cd c; make @@ -11,6 +11,11 @@ build-c: - c/libcmdlineoptions.* - c/tests-* +build-java: + image: archlinux_jdk8 + stage: build + + #test-c: #stage: test #script: diff --git a/java/.classpath b/java/.classpath index 3e0fb27..59a8c57 100644 --- a/java/.classpath +++ b/java/.classpath @@ -1,7 +1,7 @@ - + diff --git a/java/.project b/java/.project index 64c5430..484339a 100644 --- a/java/.project +++ b/java/.project @@ -12,6 +12,7 @@ + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature diff --git a/java/build.gradle b/java/build.gradle new file mode 100644 index 0000000..e69de29