Skip to content

Commit 7556999

Browse files
committed
ci: don't install unnecessary deps
the ci script is referenced in CONTRIBUTING.md as an example, so keep dependencies to a minimal. also use meta-package like "build-base" on alpine instead of installing binutils, make etc seperately.
1 parent 3f07e18 commit 7556999

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

.cirrus.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@ task:
5151
- CC: clang
5252
- CC: gcc
5353
install_script:
54-
- apk add autoconf autoconf-archive automake binutils gzip make pkgconfig
55-
$CC xorg-server-dev libxcomposite-dev libxext-dev
56-
libxfixes-dev libxinerama-dev imlib2-dev musl-dev
57-
bsd-compat-headers libbsd-dev llvm-dev
54+
- apk add build-base autoconf autoconf-archive automake gzip pkgconfig $CC
55+
xorg-server-dev libxcomposite-dev libxext-dev libxfixes-dev
56+
libxinerama-dev imlib2-dev
5857
<< : *common_script
5958

6059
task:
@@ -78,7 +77,7 @@ task:
7877
- apt-get update
7978
- apt-get install -y autoconf autoconf-archive make pkg-config $CC
8079
libx11-dev libxcomposite-dev libxext-dev libxfixes-dev
81-
libxinerama-dev libimlib2-dev libbsd-dev
80+
libxinerama-dev libimlib2-dev
8281
<< : *common_script
8382

8483
task:
@@ -117,21 +116,19 @@ task:
117116
image: alpine:latest
118117
kvm: true
119118
install_script:
120-
- apk add build-base pkgconfig gzip
119+
- apk add build-base pkgconfig
121120
xorg-server-dev libxcomposite-dev libxext-dev
122-
libxfixes-dev libxinerama-dev imlib2-dev libbsd-dev
121+
libxfixes-dev libxinerama-dev imlib2-dev
123122
matrix:
124123
- name: alpine-latest-bare-build
125124
test_script:
126-
- c99 -o src/scrot src/*.c $(pkg-config --cflags --libs ./deps.pc libbsd-overlay)
125+
- c99 -o src/scrot src/*.c $(pkg-config --cflags --libs ./deps.pc)
127126
- src/scrot -v
128127
- name: alpine-latest-gcc-aggressive-fanalyzer
129-
# NOTE: libbsd on musl triggers some `#warning`. so use `-Wno-error=cpp`.
130128
test_script:
131129
- gcc --version
132130
- gcc -std=c99 -o src/scrot src/*.c -Wall -Wextra -Wpedantic -Werror
133131
-fanalyzer -O3 -flto -fuse-linker-plugin -fno-common
134132
-fgraphite-identity -floop-nest-optimize -fipa-pta
135-
$(pkg-config --cflags --libs ./deps.pc libbsd-overlay)
136-
-Wno-error=cpp
133+
$(pkg-config --cflags --libs ./deps.pc)
137134
- src/scrot -v

0 commit comments

Comments
 (0)