aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2019-05-14 07:28:37 +0000
committerCarlo Landmeter <clandmeter@alpinelinux.org>2019-05-14 07:28:37 +0000
commit7d67ff69fb9f7080441091f8b6177921199a04a7 (patch)
tree9d99eb040ee966571dfdbbac8e37106f04ba6034
parentf51068b2e63e1febead2b932f431a17b5e5448a9 (diff)
downloadalpine-drone-ci-master.tar.bz2
alpine-drone-ci-master.tar.xz
build: apply patches 3wayHEADmaster
-rwxr-xr-xoverlay/usr/local/bin/build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/overlay/usr/local/bin/build.sh b/overlay/usr/local/bin/build.sh
index cf418e3..a24d9bf 100755
--- a/overlay/usr/local/bin/build.sh
+++ b/overlay/usr/local/bin/build.sh
@@ -96,7 +96,7 @@ setup_system() {
create_workspace() {
msg "Cloning aports and applying PR$PR"
git clone --depth=1 --branch "$BRANCH" "$REPOURL" "$APORTSDIR"
- wget -qO- "$REPOURL"/pull/"$PR".patch | git -C "$APORTSDIR" am
+ wget -qO- "$REPOURL"/pull/"$PR".patch | git -C "$APORTSDIR" am --3way
}
sysinfo() {