c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: ci: enable crypto backends on alpine/musl image

Browse source 
Add the libaries and update script so additional configure parameters
can be passed. Also enable backtrace so it's closer to the defaults.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-03-01 16:10:53 +01:00
parent 9981a6767d
commit b79b330f62
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ci/ci-build-musl
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# Usage: $0 [branch] # Usage: $0 [branch] [configure options]
# Create source tarball from HEAD or given branch and build it in musl CI # Create source tarball from HEAD or given branch and build it in musl CI
# environment # environment. Configure options follow branch name that can be empty.
HERE=`pwd` HERE=`pwd`
if [ -f "configure.ac" ]; then if [ -f "configure.ac" ]; then
@ -16,6 +16,7 @@ fi
CIIMAGEDIR=ci/images/ci-musl-x86_64 CIIMAGEDIR=ci/images/ci-musl-x86_64
BRANCH=${1:-HEAD} BRANCH=${1:-HEAD}
shift
HASH=$(git log -1 --format='%h %s' "$BRANCH") HASH=$(git log -1 --format='%h %s' "$BRANCH")
echo "CI: Generate archive from $BRANCH ($HASH)" echo "CI: Generate archive from $BRANCH ($HASH)"
@ -28,4 +29,4 @@ gzip --force --best devel.tar
cd "$CIIMAGEDIR" cd "$CIIMAGEDIR"
cp "$SOURCEDIR/devel.tar.gz" . cp "$SOURCEDIR/devel.tar.gz" .
./docker-build ./docker-build
./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev ./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev "$@"

1
ci/images/ci-musl-x86_64/Dockerfile
View file

@ -7,6 +7,7 @@ RUN apk add linux-headers musl-dev util-linux-dev bash
RUN apk add attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev zstd-dev RUN apk add attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev zstd-dev
RUN apk add autoconf automake make gcc tar gzip clang RUN apk add autoconf automake make gcc tar gzip clang
RUN apk add python3 py3-setuptools python3-dev RUN apk add python3 py3-setuptools python3-dev
RUN apk add libgcrypt-dev libsodium-dev libkcapi-dev
# For downloading fresh sources # For downloading fresh sources
RUN apk add wget RUN apk add wget