pub-solar-os/.drone/upstream-branch.sh

#!/usr/bin/env sh

set -e
set -u

LOCAL="$DRONE_BRANCH"
[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main

git fetch --all
git checkout "$LOCAL"
git merge "$UPSTREAM"
git push origin "$LOCAL"
feat/upstreaming (#4) 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> 2021-06-14 23:28:23 +00:00			`#!/usr/bin/env sh`

			`set -e`
			`set -u`

			`LOCAL="$DRONE_BRANCH"`
Drone: follow new upstream default branch main, cron fixes (#30) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/30 Co-authored-by: teutat3s <teutates@mailbox.org> Co-committed-by: teutat3s <teutates@mailbox.org> 2021-10-05 19:32:54 +00:00			`[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos \|\| UPSTREAM=origin/main`
feat/upstreaming (#4) 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> 2021-06-14 23:28:23 +00:00
			`git fetch --all`
			`git checkout "$LOCAL"`
			`git merge "$UPSTREAM"`
			`git push origin "$LOCAL"`