From 8c0ab63c3fde6e362e28fdf004901a2db03458db Mon Sep 17 00:00:00 2001 From: leafee98 Date: Mon, 13 Mar 2023 22:04:57 -0400 Subject: [PATCH] dendrite dropped polylish mode. create branch when switching tag --- dendrite/deb.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dendrite/deb.sh b/dendrite/deb.sh index e702d14..105657c 100644 --- a/dendrite/deb.sh +++ b/dendrite/deb.sh @@ -68,7 +68,9 @@ function switch_tag() fi echo "switching to tag: $TARGET_TAG" - git -C "$REPO_DIR" switch --detach "$TARGET_TAG" + git -C "$REPO_DIR" switch --force-create build "$TARGET_TAG" + echo "cleaning workspace..." + git -C "$REPO_DIR" clean --force -xd } function build() @@ -88,10 +90,9 @@ function package() rm -rf "$ROOTFS"/* install -D -t $ROOTFS/usr/local/lib/dendrite $BUILD_DIR/* - install -D -t $ROOTFS/etc/dendrite $REPO_DIR/dendrite-sample.polylith.yaml - install -D -t $ROOTFS/etc/dendrite $REPO_DIR/dendrite-sample.monolith.yaml + install -D -t $ROOTFS/etc/dendrite $REPO_DIR/dendrite-sample.yaml - export VERSION=$($BUILD_DIR/dendrite-monolith-server --version) + export VERSION=$($BUILD_DIR/dendrite --version) if [ -n "${BUILD_REL}" ] then VERSION=$VERSION-brel$BUILD_REL