stabilize CI for renamed forks and slashed branch names

This commit is contained in:
night1rider
2026-05-06 10:04:33 -06:00
parent 50da0c0a26
commit dc3ba1e299
2 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -111,8 +111,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
LOG_DIR="${SCRIPT_DIR}/logs"
mkdir -p "${LOG_DIR}"
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
ZVER="${ZEPHYR_VERSION#v}"
LOG_FILE="${LOG_DIR}/${ZVER}_${WOLFSSL_BRANCH}_${BOARD_TARGET//\//-}_${TIMESTAMP}.log"
LOG_FILE="${LOG_DIR}/${BOARD_SLUG}_${TIMESTAMP}.log"
echo "==> wolfSSL repo: ${WOLFSSL_REPO}"
echo "==> wolfSSL branch: ${WOLFSSL_BRANCH}"
@@ -175,6 +174,7 @@ cd ..
# --- 3. Update all modules (including wolfSSL) ---
echo "==> [container] Running west update..."
export GIT_TERMINAL_PROMPT=0
west update -n -o=--depth=1
# --- 3b. Checkout specific commit if requested ---
+3 -2
View File
@@ -47,8 +47,9 @@ jobs:
id: src
run: |
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
echo "repo=${{ github.event.pull_request.head.repo.clone_url }}" >> "$GITHUB_OUTPUT"
echo "branch=${{ github.event.pull_request.head.ref }}" >> "$GITHUB_OUTPUT"
# Fetch via upstream PR ref so renames, deletes, or visibility changes on the fork do not break us
echo "repo=https://github.com/${{ github.repository }}" >> "$GITHUB_OUTPUT"
echo "branch=refs/pull/${{ github.event.pull_request.number }}/head" >> "$GITHUB_OUTPUT"
else
echo "repo=https://github.com/${{ github.repository }}" >> "$GITHUB_OUTPUT"
echo "branch=${{ github.ref_name }}" >> "$GITHUB_OUTPUT"