From 5a9489eff1eee2827b128deaea75a246cec89dd2 Mon Sep 17 00:00:00 2001 From: Jack Kingsman Date: Sun, 8 Mar 2026 20:47:09 -0700 Subject: [PATCH] Updating changelog + build for 2.7.8 --- CHANGELOG.md | 4 ++++ docker-compose.yaml | 2 +- scripts/publish.sh | 19 +++++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32dcc39..0f8ff9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [2.7.8] - 2026-03-08 + + +## [2.7.8] - 2026-03-08 + Bugfix: Improve frontend asset resolution and fixup the build/push script ## [2.7.1] - 2026-03-08 diff --git a/docker-compose.yaml b/docker-compose.yaml index 10fdc03..ee79598 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: # Set your serial device for passthrough here! # ################################################ devices: - - /dev/ttyUSB0:/dev/ttyUSB0 + - /dev/ttyACM0:/dev/ttyUSB0 environment: MESHCORE_DATABASE_PATH: data/meshcore.db diff --git a/scripts/publish.sh b/scripts/publish.sh index 9dc18bd..912545c 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -148,8 +148,9 @@ git push echo -e "${GREEN}Changes committed!${NC}" echo -# Get git short hash (after commit so it reflects the new commit) +# Get git hashes (after commit so they reflect the new commit) GIT_HASH=$(git rev-parse --short HEAD) +FULL_GIT_HASH=$(git rev-parse HEAD) # Build docker image echo -e "${YELLOW}Building Docker image...${NC}" @@ -177,10 +178,24 @@ RELEASE_NOTES_FILE=$(mktemp) echo "$CHANGELOG_ENTRY" } > "$RELEASE_NOTES_FILE" +# Create and push the release tag first so GitHub release creation does not +# depend on resolving a symbolic ref like HEAD on the remote side. +if git rev-parse -q --verify "refs/tags/$VERSION" >/dev/null; then + echo -e "${YELLOW}Tag $VERSION already exists locally; reusing it.${NC}" +else + git tag "$VERSION" "$FULL_GIT_HASH" +fi + +if git ls-remote --exit-code --tags origin "refs/tags/$VERSION" >/dev/null 2>&1; then + echo -e "${YELLOW}Tag $VERSION already exists on origin; not pushing it again.${NC}" +else + git push origin "$VERSION" +fi + gh release create "$VERSION" \ --title "$VERSION" \ --notes-file "$RELEASE_NOTES_FILE" \ - --target HEAD + --verify-tag rm -f "$RELEASE_NOTES_FILE" echo -e "${GREEN}GitHub release created!${NC}"