Skip to content

Fix build scripts continuing after Docker failures #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avskum wants to merge 1 commit into
base: master
Choose a base branch
from
+54 −12
Open

Fix build scripts continuing after Docker failures #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions script-v3-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#!/usr/bin/env bash
set -euo pipefail

run_kernelbuild() {
local image="$1"
local status

if time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v "$PWD":/pkg "$image"; then
status=0
else
status=$?
fi

docker rm kernelbuild >/dev/null 2>&1 || true
return "$status"
}

## Enable ZFS
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_build_zfs:=no/_build_zfs:=yes/" {}
## Enable Generic v3
Expand All @@ -19,8 +35,7 @@ for f in $files
do
d=$(dirname $f)
cd $d
time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v $PWD:/pkg pttrr/docker-makepkg-v3
docker rm kernelbuild
run_kernelbuild pttrr/docker-makepkg-v3
cd ..
done

Expand All @@ -33,8 +48,7 @@ for f in $files
do
d=$(dirname $f)
cd $d
time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v $PWD:/pkg pttrr/docker-makepkg-v3
docker rm kernelbuild
run_kernelbuild pttrr/docker-makepkg-v3
cd ..
done

Expand All @@ -54,8 +68,7 @@ for f in $files
do
d=$(dirname $f)
cd $d
time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v $PWD:/pkg pttrr/docker-makepkg-v4
docker rm kernelbuild
run_kernelbuild pttrr/docker-makepkg-v4
cd ..
done

Expand All @@ -68,8 +81,7 @@ for f in $files
do
d=$(dirname $f)
cd $d
time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v $PWD:/pkg pttrr/docker-makepkg-v4
docker rm kernelbuild
run_kernelbuild pttrr/docker-makepkg-v4
cd ..
done

Expand Down
19 changes: 17 additions & 2 deletions script-znver4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#!/usr/bin/env bash
set -euo pipefail

run_kernelbuild() {
local image="$1"
local status

if time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v "$PWD":/pkg "$image"; then
status=0
else
status=$?
fi

docker rm kernelbuild >/dev/null 2>&1 || true
return "$status"
}

## Enable ZFS
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_build_zfs:=no/_build_zfs:=yes/" {}
## Enable Zen 4
Expand All @@ -17,8 +33,7 @@ for f in $files
do
d=$(dirname $f)
cd $d
time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v $PWD:/pkg pttrr/docker-makepkg-znver4
docker rm kernelbuild
run_kernelbuild pttrr/docker-makepkg-znver4
cd ..
done

Expand Down
19 changes: 17 additions & 2 deletions script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#!/usr/bin/env bash
set -euo pipefail

run_kernelbuild() {
local image="$1"
local status

if time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v "$PWD":/pkg "$image"; then
status=0
else
status=$?
fi

docker rm kernelbuild >/dev/null 2>&1 || true
return "$status"
}

## Enable Generic
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_processor_opt:=/_processor_opt:=GENERIC/" {}
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_auto_optimization:=yes/_use_auto_optimization:=no/" {}
Expand All @@ -15,8 +31,7 @@ for f in $files
do
d=$(dirname $f)
cd $d
time docker run --name kernelbuild -e EXPORT_PKG=1 -e SYNC_DATABASE=1 -e CHECKSUMS=1 -v $PWD:/pkg pttrr/docker-makepkg
docker rm kernelbuild
run_kernelbuild pttrr/docker-makepkg
cd ..
done

Expand Down