CI: Use default-jdk-headless for builds

Makes it unnecessary to create they symbolic link to /usr/lib/jvm/default-java ourselves
CI: Remove dh-systemd dep from builds
2021-01-29 00:08:01 +01:00 · 2021-01-29 00:08:01 +01:00 · 2021-01-29 00:08:01 +01:00 · 2021-01-29 00:08:01 +01:00 · 2021-01-29 00:08:01 +01:00 · 2021-01-29 00:08:01 +01:00
2 changed files with 39 additions and 1 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,3 +66,40 @@ build_docker:
        - merge_requests
        - tags

+
+.build_debian:
+    image: debian:buster-slim
+    stage: build
+    variables:
+        DEBIAN_FRONTEND: noninteractive
+    before_script:
+        # Workaround for installing openjdk-11-jre-headless
+        - mkdir -p /usr/share/man/man1
+        - apt-get update
+        - apt-get -qqqy install debhelper ant debconf gettext libgmp-dev po-debconf fakeroot
+            build-essential quilt dh-apparmor libservice-wrapper-java libjson-simple-java
+            devscripts libjetty9-java libtomcat9-java libtaglibs-standard-jstlel-java libgetopt-java
+            default-jdk-headless bash-completion
+    script:
+        - ant debian
+    only:
+        - master
+        - merge_requests
+        - tags
+
+build_debian:buster:
+    extends: .build_debian
+
+build_debian:bullseye:
+    image: debian:bullseye-slim
+    extends: .build_debian
+
+build_ubuntu-bionic:
+    image: ubuntu:bionic
+    extends: .build_debian
+    before_script:
+        - apt-get update
+        - apt-get -qqqy install debhelper ant debconf gettext libgmp-dev po-debconf fakeroot
+            build-essential quilt dh-apparmor libservice-wrapper-java libjson-simple-java
+            devscripts libjetty9-java libtomcat9-java libtaglibs-standard-jstlel-java libgetopt-java
+            bash-completion default-jdk-headless
--- a/debian/rules
+++ b/debian/rules
@@ -51,9 +51,10 @@ endif


 %:
-	dh $@ --with systemd,bash-completion
+	dh $@ --with systemd,bash-completion,quilt

 clean: createcopyright
+	dh $@ --with systemd,bash-completion

 override_dh_auto_clean:
 	-[ -r $(CURDIR)/debian/routerversion.java.bak ] && mv -f $(CURDIR)/debian/routerversion.java.bak $(ROUTERVERSION)
Author	SHA1	Message	Date
LoveIsGrief	f1d6fc7a68	CI: Use default-jdk-headless for builds Makes it unnecessary to create they symbolic link to /usr/lib/jvm/default-java ourselves	2021-01-29 00:08:01 +01:00
LoveIsGrief	36bbe6cb69	CI: Remove dh-systemd dep from builds It was deprecated and moved into debhelper according to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958611	2021-01-29 00:08:01 +01:00
LoveIsGrief	0d89f24965	CI: add build_debian:bullseye Bullseye is the next release of debian it would be nice to make sure that it's building properly.	2021-01-29 00:08:01 +01:00
LoveIsGrief	14dd91f17e	CI: Rename build_debian --> build_debian:buster We will be adding other versions	2021-01-29 00:08:01 +01:00
LoveIsGrief	c19df57e48	ant: Fix debian-clean for bionic It was calling `dh $@ --with systemd,bash-completion,quilt` and failing due to trying to reset the patches.	2021-01-29 00:08:01 +01:00
LoveIsGrief	6ab0bd2f89	CI:bionic: force creation of default-java folder It was pointing to JDK11 for some reason	2021-01-29 00:08:01 +01:00
LoveIsGrief	2cc26762b4	CI: Create /usr/lib/jvm/default-java directories jni.h is search in /usr/lib/jvm/default-java/include/jni.h	2021-01-29 00:08:01 +01:00
LoveIsGrief	bb52124f98	CI: Use small package for jni.h The openjdk-*-source packages depend on larger packages that we don't all need.	2021-01-29 00:08:01 +01:00
LoveIsGrief	aace7f6914	CI: Use same command for bionic and debian `ant bionic` was supposedly also just a test and shouldn't be used. It overwrites debian/rules and removes `quilt` from the `dh patch` command.	2021-01-29 00:08:01 +01:00
LoveIsGrief	c9a7ddef44	CI: Remove build_debian-buster `ant buster` was only a test and isn't usable anymore.	2021-01-29 00:08:01 +01:00
LoveIsGrief	ad347cada7	Attempt to fix ubuntu:bionic build The JDK sources are needed to build JNI dependent packages	2021-01-29 00:08:01 +01:00
LoveIsGrief	6c2759dda7	Fix: Fix building debian buster package quilt was needed to apply the diffs while building the package. Additionally the jdk sources are needed to build JNI dependent packages.	2021-01-29 00:08:01 +01:00
LoveIsGrief	75e81b7aca	CI: Actually use bionic image for bionic job	2021-01-29 00:08:01 +01:00
LoveIsGrief	e3208c982b	CI: Try to fix apt-get line for debian and ubuntu There were too many escapes	2021-01-29 00:08:01 +01:00
LoveIsGrief	2dcffc6f29	CI: Check debian buster and ubuntu bionic builds A simple check to make sure that they can be built	2021-01-29 00:07:58 +01:00