a9e304617b
Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu> Co-authored-by: teutat3s <teutates@mailbox.org> Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/4 Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org> Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
13 lines
213 B
Bash
Executable file
13 lines
213 B
Bash
Executable file
#!/usr/bin/env sh
|
|
|
|
set -e
|
|
set -u
|
|
|
|
LOCAL="$DRONE_BRANCH"
|
|
[ "$LOCAL" = "core" ] && UPSTREAM=origin/devos || UPSTREAM=origin/core
|
|
|
|
git fetch --all
|
|
git checkout "$LOCAL"
|
|
git merge "$UPSTREAM"
|
|
git push origin "$LOCAL"
|