Skip to content

Keep make up working with a dirty editor clone or no network #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erseco merged 1 commit into from
Sep 26, 2026
Merged

Keep make up working with a dirty editor clone or no network #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ EDITOR_OUTPUT_DIR := $(CURDIR)/dist/static
EDITOR_REPO_DEFAULT := https://github.com/exelearning/exelearning.git
EDITOR_REF_DEFAULT := main

# Fetch editor source code from remote repository (clone or update existing)
# Fetch editor source code from remote repository (clone or update existing).
# build-editor's `bun install` rewrites bun.lock; that change is discarded
# before checkout so the next fetch can move the clone.
fetch-editor-source:
@set -e; \
get_env() { \
Expand All @@ -45,6 +47,7 @@ fetch-editor-source:
git -C $(EDITOR_SUBMODULE_PATH) remote add origin "$$REPO_URL"; \
fi; \
OLD_HEAD=$$(git -C $(EDITOR_SUBMODULE_PATH) rev-parse HEAD 2>/dev/null || echo "none"); \
git -C $(EDITOR_SUBMODULE_PATH) checkout -q -- bun.lock 2>/dev/null || true; \
case "$$REF_TYPE" in \
tag) \
git -C $(EDITOR_SUBMODULE_PATH) fetch --depth 1 origin "refs/tags/$$REF:refs/tags/$$REF"; \
Expand Down Expand Up @@ -112,8 +115,15 @@ build-editor: check-bun fetch-editor-source
@echo "============================================"

# Build only if needed: skip when dist/static/ exists and source hasn't changed
build-editor-if-needed: fetch-editor-source
@BUILD_COMMIT=""; \
build-editor-if-needed:
@if ! $(MAKE) --no-print-directory fetch-editor-source; then \
if [ -f "$(EDITOR_OUTPUT_DIR)/index.html" ]; then \
echo "Warning: could not update the editor source; keeping the existing build."; \
exit 0; \
fi; \
exit 1; \
fi; \
BUILD_COMMIT=""; \
if [ -f "$(EDITOR_OUTPUT_DIR)/.build-commit" ]; then \
BUILD_COMMIT=$$(cat "$(EDITOR_OUTPUT_DIR)/.build-commit"); \
fi; \
Expand Down
Loading