mirror of
https://github.com/kdave/btrfs-progs
synced 2025-05-16 06:48:18 +00:00
btrfs-progs: ci: fix docker test entry point scripts
There was a bug when a branch contained a slash then the file with downloaded sources was not found. Update all, all images have to be rebuilt and pushed to docker hub so the changes are applied inside github actions. Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
335116e359
commit
337ef1141d
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -8,4 +8,4 @@ image=$(basename `pwd` | tr '[A-Z]' '[a-z]')
|
||||
# Make sure the file exists as it's required but can be empty. In that case
|
||||
# it's downloaded when ./test-build is executed
|
||||
touch devel.tar.gz
|
||||
docker buildx build --platform linux/386 -t "$prefix/$image" .
|
||||
docker build --platform linux/386 -t "$prefix/$image" .
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -18,10 +19,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
@ -3,8 +3,9 @@
|
||||
|
||||
urlbase="https://github.com/kdave/btrfs-progs/archive"
|
||||
branch=${1:-devel}
|
||||
fname="${branch}.tar.gz"
|
||||
url="${urlbase}/${fname}"
|
||||
fnbase="${branch/\//-}"
|
||||
fname="${fnbase}.tar.gz"
|
||||
url="${urlbase}/${branch}.tar.gz"
|
||||
|
||||
shift
|
||||
|
||||
@ -13,10 +14,10 @@ cd /tmp
|
||||
if [ -f "$fname" -a -s "$fname" ]; then
|
||||
echo "Found local file $fname, not downloading"
|
||||
else
|
||||
echo "Missing or empty tar, downloading devel branch from git"
|
||||
echo "Missing or empty tar, downloading branch $branch from git"
|
||||
rm -- "$fname"
|
||||
wget "$url" -O "$fname"
|
||||
fi
|
||||
tar xf "$fname"
|
||||
cd "btrfs-progs-$branch"
|
||||
cd "btrfs-progs-$fnbase"
|
||||
ci/build-default "$@"
|
||||
|
Loading…
Reference in New Issue
Block a user