Skip to content

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

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
kascit merged 3 commits into from
May 12, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ad8a7c
chore(merge): resolve shell.min.js conflict, keep current version
kascit May 12, 2026
44515d8
fix(workflow): add proper quoting for shell variable expansions and r…
kascit May 12, 2026
80638ee
Merge branch 'main' into fix-csp
kascit May 12, 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
29 changes: 24 additions & 5 deletions .github/workflows/raw-mirror.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:
run: |
set -euo pipefail
MANIFEST_FILE=".github/raw-mirror-paths.txt"
# Set up CR variable for proper quoting in expansions
CR=$'\r'

rm -rf .raw-mirror-staging
mkdir -p .raw-mirror-staging
Expand All @@ -67,9 +69,9 @@ jobs:

while IFS= read -r line || [ -n "$line" ]; do
path="${line%%#*}"
path="${path%$'\r'}"
path="${path#${path%%[![:space:]]*}}"
path="${path%${path##*[![:space:]]}}"
path="${path%"$CR"}"
path="${path#"${path%%[![:space:]]*}"}"
path="${path%"${path##*[![:space:]]}"}"

if [ -z "$path" ]; then
continue
Expand All @@ -84,10 +86,27 @@ jobs:
;;
esac

# Support multiple potential build locations: prefer public/, fall back to static/ (some builds place assets there).
source_file="public/$path"
Comment on lines +89 to 90
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 on lines +89 to +95
# try static/images/branding/<basename> for image-only fallbacks (restrict to images/ prefix)
if [[ "$path" == images/* ]]; then
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
fi
else
echo "Missing built artifact: public/$path (also checked static/$path)"
exit 1
fi
fi
fi

mkdir -p ".raw-mirror-staging/$(dirname "$path")"
Expand Down
Loading