diff --git a/ci/ci-build-leap154 b/ci/ci-build-leap154 new file mode 100755 index 00000000..6edcf1ac --- /dev/null +++ b/ci/ci-build-leap154 @@ -0,0 +1,31 @@ +#!/bin/sh +# Usage: $0 [branch] +# Create source tarball from HEAD or given branch and build it in musl CI +# environment + +HERE=`pwd` +if [ -f "configure.ac" ]; then + SOURCEDIR=`pwd` +elif [ -f "../configure.ac" ]; then + cd .. + SOURCEDIR=`pwd` +else + echo "ERROR: cannot determine source directory from `pwd`" + exit 1 +fi + +CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64 +BRANCH=${1:-HEAD} +HASH=$(git log -1 --format='%h %s' "$BRANCH") + +echo "CI: Generate archive from $BRANCH ($HASH)" +git archive --prefix=btrfs-progs-devel/ -o devel.tar "$BRANCH" +echo "$BRANCH $HASH" > GITCOMMIT +tar uvf devel.tar GITCOMMIT +#rm GITCOMMIT +gzip --force --best devel.tar + +cd "$CIIMAGEDIR" +cp "$SOURCEDIR/devel.tar.gz" . +./docker-build +./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev diff --git a/ci/images/ci-openSUSE-Leap-15.2-x86_64/Dockerfile b/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile similarity index 97% rename from ci/images/ci-openSUSE-Leap-15.2-x86_64/Dockerfile rename to ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile index 3583b311..c6285ea6 100644 --- a/ci/images/ci-openSUSE-Leap-15.2-x86_64/Dockerfile +++ b/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile @@ -1,4 +1,4 @@ -FROM opensuse/leap:15.2 +FROM opensuse/leap:15.4 WORKDIR /tmp diff --git a/ci/images/ci-openSUSE-Leap-15.2-x86_64/docker-build b/ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-build similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.2-x86_64/docker-build rename to ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-build diff --git a/ci/images/ci-openSUSE-Leap-15.2-x86_64/docker-run b/ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-run similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.2-x86_64/docker-run rename to ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-run diff --git a/ci/images/ci-openSUSE-Leap-15.2-x86_64/run-tests b/ci/images/ci-openSUSE-Leap-15.4-x86_64/run-tests similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.2-x86_64/run-tests rename to ci/images/ci-openSUSE-Leap-15.4-x86_64/run-tests diff --git a/ci/images/ci-openSUSE-Leap-15.2-x86_64/test-build b/ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.2-x86_64/test-build rename to ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build