Merge branch 'ci-tweaks' into 'master'

CI tweaks See merge request sane-project/backends!125
2019-08-12 09:16:37 +00:00 · 2019-08-12 09:16:37 +00:00 · f37326784d
commit f37326784d
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -9,14 +9,18 @@ variables:
  CONFIGURE_FULL: "--with-usb --enable-avahi --enable-pnm-backend"

 stages:
-  - prepare
+  - tarball
  - compile
-  - archive
+  - snapshot
  - release

-prepare:
-  image: $REGISTRY_HUB:debian-stretch-mini
-  stage: prepare
+# This job creates the source tarball that is the *sole* input to our
+# compile stage.  The job is meant to be run on the stable release of
+# Debian GNU/Linux.
+
+make-dist:
+  image: $REGISTRY_HUB:debian-buster-mini
+  stage: tarball
  script:
  - git ls-files | xargs ./tools/style-check.sh
  - ./autogen.sh
@ -29,7 +33,13 @@ prepare:
    - sane-backends-*.tar.gz
    expire_in: 1 day

+# This template is used for all jobs in the compile stage.  As the
+# template solely relies on the source tarball there is no need to
+# checkout the git repository.
+
 .compile_template: &compile_definition
+  variables:
+    GIT_DEPTH: "0"
  stage: compile
  script:
  - mkdir build
@ -38,19 +48,30 @@ prepare:
  - ./configure $CONFIGURE_OPTS
  - make -j2 -k $MAKE_FLAGS

-compile:debian-9-mini:
-  image: $REGISTRY_HUB:debian-stretch-mini
-  variables:
-    CONFIGURE_OPTS: "$CONFIGURE_MINI"
-    MAKE_FLAGS: "CFLAGS=-Werror"
-  <<: *compile_definition
-
-compile:debian-9-full:
+debian-9-full:
  image: $REGISTRY_HUB:debian-stretch-full
  variables:
    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
    MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
  <<: *compile_definition
+
+debian-10-mini:
+  image: $REGISTRY_HUB:debian-buster-mini
+  variables:
+    CONFIGURE_OPTS: "$CONFIGURE_MINI"
+    #MAKE_FLAGS: "CFLAGS=-Werror"
+  <<: *compile_definition
+
+# In addition to the regular compile check, the full Debian stable
+# environment is used to keep some of the HTML documentation that's
+# available from our website up-to-date.
+
+debian-10-full:
+  image: $REGISTRY_HUB:debian-buster-full
+  variables:
+    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
+    #MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
+  <<: *compile_definition
  after_script:
  - make -C build/doc html-pages
  - rm -rf lists && mkdir lists && mv build/doc/*.html lists/
@ -62,43 +83,34 @@ compile:debian-9-full:
    - doc/sanei-html
    expire_in: 1 day

-compile:debian-10-mini:
-  image: $REGISTRY_HUB:debian-buster-mini
-  variables:
-    CONFIGURE_OPTS: "$CONFIGURE_MINI"
-    #MAKE_FLAGS: "CFLAGS=-Werror"
-  <<: *compile_definition
-
-compile:debian-10-full:
-  image: $REGISTRY_HUB:debian-buster-full
-  variables:
-    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
-    #MAKE_FLAGS: "CFLAGS=-Werror"
-  <<: *compile_definition
-
-compile:fedora-29-clang:
-  image: $REGISTRY_HUB:fedora-29-clang
-  variables:
-    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
-  <<: *compile_definition
-
-compile:fedora-30-clang:
+fedora-30-clang:
  image: $REGISTRY_HUB:fedora-30-clang
  variables:
    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
  <<: *compile_definition

-compile:alpine-3.10-musl:
+alpine-3.10-musl:
  image: $REGISTRY_HUB:alpine-3.10-musl
  variables:
    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
  <<: *compile_definition

-archive:
-  image: $REGISTRY_HUB:debian-stretch-full
-  stage: archive
+# This snapshot stage job makes sure that the source tarball has all
+# it needs to rebuild itself, install everything built and cleans up
+# without leaving any droppings behind when uninstalling.  The build
+# result will be available as a snapshot for a limited time period.
+# People that prefer a source tarball to work with should use this
+# snapshot.
+# Some HTML documentation derived from this project's source is also
+# uploaded for use by our website so it uses the latest information.
+# It gets these artifacts from the full compile job on Debian stable,
+# hence the dependency.
+
+make-distcheck:
+  image: $REGISTRY_HUB:debian-buster-full
+  stage: snapshot
  dependencies:
-  - compile:debian-9-full
+  - debian-10-full
  script:
  - tar xzf sane-backends-*.tar.gz --strip-components=1
  - rm sane-backends-*.tar.gz
@ -109,8 +121,13 @@ archive:
    - sane-backends-*.tar.gz
    - lists
    - doc/sanei-html
+    expire_in: 90 days

-release:
+# For release tags only, this manual job handles putting all of the
+# releasables on the Project Releases page.  See the script for more
+# details.
+
+upload:
  image: alpine
  stage: release
  before_script:
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@ -17,7 +17,12 @@ DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):
 LIBTOOL += --silent
 FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu

+# Needed by most backends as they add sane_strstatus.lo to their list
+# of libraries to link with via libsane_${BACKEND}_la_LIBADD.  Due to
+# the implicit dependency, automake does not notice the need to clean
+# up the dependency tracking file.
 EXTRA_DIST = sane_strstatus.c
+CLEANFILES = $(DEPDIR)/sane_strstatus.Plo

 all: becfg

@ -133,7 +138,7 @@ uninstall-hook:
 	  rmdir $(DESTDIR)$(datadir)/sane/$${dir} ; \
 	done

-CLEANFILES = $(BACKEND_CONFS) $(be_convenience_libs)
+CLEANFILES += $(BACKEND_CONFS) $(be_convenience_libs)
 clean-local:
 	find . -type l -name \*-s.c | xargs rm -f

--- a/japi/Makefile.am
+++ b/japi/Makefile.am
@ -31,12 +31,12 @@ EXTRA_DIST = README.JAVA

 lib_LTLIBRARIES = libsanej.la

-BUILT_SOURCES = Sane.h
-CLEANFILES = Sane.h
-nodist_libsanej_la_SOURCES = Sane.h
 libsanej_la_SOURCES = Sane.c
 libsanej_la_LIBADD = $(LIBSANE)

-# Make sure that java classes get created before create Sane.h
-Sane.h: classdist_noinst.stamp
+# Explicit dependencies
+nodist_libsanej_la_SOURCES: Sane.h
+Sane.h: classnoinst.stamp
 	$(JAVAH) Sane
+
+CLEANFILES = Sane.h
--- a/ltmain.sh.patch
+++ b/ltmain.sh.patch
@ -5,10 +5,10 @@ Author: Henning Meirer-Geinitz
 diff --git a/ltmain.sh b/ltmain.sh
 --- a/ltmain.sh
 +++ b/ltmain.sh
-@@ -9615,6 +9615,23 @@ EOF
+@@ -9708,6 +9708,23 @@
 	  dlname=$soname
 	fi
-
+ 
 +	# If -module or -export-dynamic was specified, set the dlname
 +	if test "$module" = yes || test "$export_dynamic" = yes; then
 +	  # On all known operating systems, these are identical.
@ -29,7 +29,7 @@ diff --git a/ltmain.sh b/ltmain.sh
 	lib=$output_objdir/$realname
 	linknames=
 	for link
-@@ -10073,12 +10090,6 @@ EOF
+@@ -10166,12 +10183,6 @@
 	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
 	  fi
 	done
@ -41,4 +41,4 @@ diff --git a/ltmain.sh b/ltmain.sh
 -	fi
       fi
       ;;
-
+ 
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@ -48,9 +48,9 @@ sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
 gamma4scanimage_SOURCES = gamma4scanimage.c
 gamma4scanimage_LDADD = $(MATH_LIB)

-umax_pp_SOURCES = umax_pp.c
-umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \
-	        ../backend/umax_pp_low.lo
+umax_pp_SOURCES  = umax_pp.c
+umax_pp_SOURCES += ../backend/umax_pp_low.c
+umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB)

 sane_desc_SOURCES = sane-desc.c
 sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la