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 'fix-alpine-build' into 'master' 

CI: Workaround build failures on Alpine

See merge request sane-project/backends!808
merge-requests/569/head
Alex Belkin 2023-11-06 22:00:14 +00:00
rodzic 5b067b7cda 7a18846c60
commit 2ba7215acf
1 zmienionych plików z 3 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
.gitlab-ci.yml
Wyświetl plik

@ -38,8 +38,8 @@ make-dist:
- mkdir build - mkdir build
- cd build - cd build
- tar xzf ../sane-backends-*.tar.gz --strip-components=1 - tar xzf ../sane-backends-*.tar.gz --strip-components=1
- ./configure $CONFIGURE_OPTS - (set -x; ./configure $CONFIGURE_OPTS)
- make -j2 -k $MAKE_FLAGS - eval "(set -x; make -j2 -k $MAKE_FLAGS)"
debian-10-full: debian-10-full:
image: $REGISTRY_HUB:debian-buster-full image: $REGISTRY_HUB:debian-buster-full
@ -87,9 +87,8 @@ alpine-3.15-musl:
image: $REGISTRY_HUB:alpine-3.15-musl image: $REGISTRY_HUB:alpine-3.15-musl
variables: variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" MAKE_FLAGS: "CFLAGS='-Werror -Wno-pedantic' CXXFLAGS=-Werror"
<<: *compile_definition <<: *compile_definition
allow_failure: true
ubuntu-22.04-lts: ubuntu-22.04-lts:
image: $REGISTRY_HUB:ubuntu-jammy-dist image: $REGISTRY_HUB:ubuntu-jammy-dist