Skip to content
Merged
Changes from all commits
Commits
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: 12 additions & 2 deletions .github/workflows/deploy-neep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,25 @@ jobs:
BUILD_DIR="$CANARY_DIR/build/$BUILD_PRESET"
BRANCH="${{ steps.setup.outputs.name }}"
IS_CLEAN="${{ steps.setup.outputs.is_clean }}"
HAS_PR="${{ steps.setup.outputs.has_pr }}"
PR_NUMBER="${{ steps.setup.outputs.pr_number }}"

export VCPKG_ROOT="$VCPKG_DIR"
export PATH="$VCPKG_DIR:$PATH"

echo "=== [1/7] Checking out branch: $BRANCH ==="
cd "$CANARY_DIR"
git fetch origin
git checkout "$BRANCH" 2>/dev/null || git checkout -b "$BRANCH"
git reset --hard "origin/$BRANCH"
if [ "$HAS_PR" = "true" ] && [ -n "$PR_NUMBER" ]; then
# PR head may live in a fork; use the GitHub PR ref so this works
# for both same-repo and fork PRs.
git fetch origin "+refs/pull/${PR_NUMBER}/head:refs/remotes/pr/${PR_NUMBER}"
git checkout -B "$BRANCH" "refs/remotes/pr/${PR_NUMBER}"
git reset --hard "refs/remotes/pr/${PR_NUMBER}"
else
git checkout "$BRANCH" 2>/dev/null || git checkout -b "$BRANCH"
git reset --hard "origin/$BRANCH"
fi
git clean -fdx --exclude=build --exclude=config.lua

echo "=== [2/7] Updating vcpkg ==="
Expand Down