Skip to content

Dev #21

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
xukki241 merged 4 commits into from
Mar 28, 2026
Merged

Dev #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9045e2c
Refactor code structure for improved readability and maintainability
lanhlungboiz045 Mar 28, 2026
347c002
fix: improve git fetch and checkout process with fallback to sudo for…
xukki241 Mar 28, 2026
36e9a5e
Merge branch 'dev' of https://github.com/touchmegit1/SmallTrend into dev
xukki241 Mar 28, 2026
2dddddd
Merge branch 'main' of https://github.com/touchmegit1/SmallTrend into…
xukki241 Mar 28, 2026
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
14 changes: 11 additions & 3 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,17 @@ jobs:
if [ -d .git ]; then
git config --global --add safe.directory "$DEPLOY_PATH" || true
sudo git config --system --add safe.directory "$DEPLOY_PATH" || true
git fetch origin
git checkout main
git pull --ff-only origin main

# Try normal git first; fallback to sudo git when .git is root-owned.
if git -C "$DEPLOY_PATH" fetch origin; then
git -C "$DEPLOY_PATH" checkout main
git -C "$DEPLOY_PATH" pull --ff-only origin main
else
echo "Normal git fetch failed, retry with sudo git..."
sudo git -C "$DEPLOY_PATH" fetch origin
sudo git -C "$DEPLOY_PATH" checkout main
sudo git -C "$DEPLOY_PATH" pull --ff-only origin main
fi
fi

if [ ! -f "$ENV_FILE" ]; then
Expand Down
Loading
Loading