Skip to content

chore(merge): resolve shell.min.js conflict, keep current version#50

Merged
kascit merged 3 commits into
mainfrom
fix-csp
May 12, 2026
Merged

chore(merge): resolve shell.min.js conflict, keep current version#50
kascit merged 3 commits into
mainfrom
fix-csp

Conversation

@kascit
Copy link
Copy Markdown
Owner

@kascit kascit commented May 12, 2026

No description provided.

Copilot AI review requested due to automatic review settings May 12, 2026 20:10
@github-actions github-actions Bot added the ci label May 12, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the raw-mirror publishing workflow to be more flexible about where mirrored artifacts are sourced from during the staging step.

Changes:

  • Adds fallback artifact lookup logic: prefer public/, then fall back to static/, then static/images/branding/<basename>.
  • Improves the failure message to include the additional checked locations when an artifact can’t be found.

Comment on lines +87 to +93
# Support multiple potential build locations: prefer public/, fall back to static/ (some builds place assets there).
source_file="public/$path"
if [ ! -f "$source_file" ]; then
echo "Missing built artifact: $source_file"
exit 1
# try static/ (source assets present in repo)
if [ -f "static/$path" ]; then
source_file="static/$path"
else
Comment thread .github/workflows/raw-mirror.yml Outdated
Comment on lines +94 to +100
# try static/images/branding/<basename> for image-only fallbacks
base="$(basename "$path")"
if [ -f "static/images/branding/$base" ]; then
source_file="static/images/branding/$base"
else
echo "Missing built artifact: public/$path (also checked static/$path and static/images/branding/$base)"
exit 1
Comment on lines +87 to 88
# Support multiple potential build locations: prefer public/, fall back to static/ (some builds place assets there).
source_file="public/$path"
@kascit kascit merged commit 8a2f1d6 into main May 12, 2026
15 checks passed
@kascit kascit deleted the fix-csp branch May 13, 2026 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants