This is an automated email from the ASF dual-hosted git repository.
jeffreyvo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-site.git
The following commit(s) were added to refs/heads/main by this push:
new eca0115 fixed makefile which pinned old issue (#149)
eca0115 is described below
commit eca0115820c3080a55e0850be7e4fe93f77958cd
Author: Abhinandan Kaushik <[email protected]>
AuthorDate: Mon Feb 9 12:16:49 2026 +0530
fixed makefile which pinned old issue (#149)
* fixed makefile which pinned old issue
* implemented all copilot feedback
* Modify Makefile to sync with origin/main
Updated git commands to remove hard reset.
---
Makefile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index b840183..7139a7d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,8 @@
IMAGE_NAME = df-site-build
REPO_NAME = infrastructure-actions
-COMMIT_HASH = 8aee7a080268198548d8d1b4f1315a4fb94bffea
-.PHONY: clone-repo checkout-commit build-image build
+.PHONY: clone-repo sync-repo build-image build
all: build
@@ -32,15 +31,17 @@ clone-repo:
echo "$(REPO_NAME) already exists, skipping clone."; \
fi
-# checks out the specific commit due to
https://github.com/apache/infrastructure-actions/issues/218
-checkout-commit: clone-repo
+# syncs the repository with the latest changes from the main branch
+sync-repo: clone-repo
@cd $(REPO_NAME) && \
- if [ "$$(git rev-parse HEAD)" = "$(COMMIT_HASH)" ]; then \
- echo "Repository is already at commit $(COMMIT_HASH), skipping
checkout."; \
- else \
- echo "Checking out commit $(COMMIT_HASH)..."; \
- git fetch --depth 1 origin $(COMMIT_HASH) && git checkout
$(COMMIT_HASH); \
- fi
+ if [ -n "$$(git status --porcelain)" ]; then \
+ echo "Error: Repository has uncommitted changes. Please clean
the repository first."; \
+ exit 1; \
+ fi; \
+ echo "Syncing with origin/main..."; \
+ git fetch origin main && \
+ git checkout main
+
# builds the Docker image with pelicanasf installed
build-image:
@@ -52,6 +53,6 @@ build-image:
fi
# runs the Docker container to build the site
-build: checkout-commit build-image
+build: sync-repo build-image
docker run -it --rm -p8000:8000 -v $(PWD):/site --entrypoint /bin/bash
$(IMAGE_NAME) -c \
"pelicanasf content -o blog && python3 -m http.server 8000"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
