mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'ci-updates' into 'master' 

CI updates

See merge request sane-project/backends!478
merge-requests/244/head
Olaf Meeuwissen 2020-05-30 04:20:44 +00:00
rodzic 9165864eef db20a613c3
commit 4a5c7d6889
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
.gitlab-ci.yml
Wyświetl plik

@ -6,7 +6,7 @@
variables: variables:
REGISTRY_HUB: "registry.gitlab.com/sane-project/ci-envs" REGISTRY_HUB: "registry.gitlab.com/sane-project/ci-envs"
CONFIGURE_MINI: "--enable-silent-rules" CONFIGURE_MINI: "--enable-silent-rules"
CONFIGURE_FULL: "--with-usb --with-avahi --enable-pnm-backend --with-libcurl --with-poppler-glib" CONFIGURE_FULL: "--with-usb --with-usb-record-replay --with-avahi --enable-pnm-backend --with-libcurl --with-poppler-glib"
stages: stages:
- tarball - tarball
@ -82,8 +82,8 @@ fedora-32-clang:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
<<: *compile_definition <<: *compile_definition
alpine-3.11-musl: alpine-3.12-musl:
image: $REGISTRY_HUB:alpine-3.11-musl image: $REGISTRY_HUB:alpine-3.12-musl
variables: variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
<<: *compile_definition <<: *compile_definition