Merge commit '35e6a301aa36e43df8458cb7c6ed40f60c642b78' into lsp-server
This commit is contained in:
@@ -9,6 +9,7 @@ concurrency:
|
||||
|
||||
env:
|
||||
WORKSPACE_DIR: "/home/workspace"
|
||||
TARGET_BRANCH: "main"
|
||||
SUPERPOWERS_BRANCH: "thirdparty/skill"
|
||||
SUPERPOWERS_DIR: "superpowers"
|
||||
SUPERPOWERS_LIST: "codex/skills/.sources/superpowers.list"
|
||||
@@ -51,18 +52,10 @@ jobs:
|
||||
cd "$REPO_DIR"
|
||||
fi
|
||||
|
||||
TARGET_SHA="${{ github.sha }}"
|
||||
TARGET_REF="${{ github.ref }}"
|
||||
if git cat-file -e "$TARGET_SHA^{commit}" 2>/dev/null; then
|
||||
git checkout -f "$TARGET_SHA"
|
||||
else
|
||||
if [ -n "$TARGET_REF" ]; then
|
||||
git fetch origin "$TARGET_REF"
|
||||
git checkout -f FETCH_HEAD
|
||||
else
|
||||
git checkout -f "${{ github.ref_name }}"
|
||||
fi
|
||||
fi
|
||||
# Always run sync from the latest target branch state.
|
||||
# This prevents stale/manual dispatch refs from using outdated scripts.
|
||||
git fetch origin "${{ env.TARGET_BRANCH }}"
|
||||
git checkout -B "${{ env.TARGET_BRANCH }}" "origin/${{ env.TARGET_BRANCH }}"
|
||||
|
||||
git config --global --add safe.directory "$REPO_DIR"
|
||||
echo "REPO_DIR=$REPO_DIR" >> $GITHUB_ENV
|
||||
|
||||
Reference in New Issue
Block a user