fix: deploy .htaccess and add HTML redirect fallbacks#685
Closed
andreahlert wants to merge 4 commits intoapache:mainfrom
Closed
fix: deploy .htaccess and add HTML redirect fallbacks#685andreahlert wants to merge 4 commits intoapache:mainfrom
andreahlert wants to merge 4 commits intoapache:mainfrom
Conversation
Add a modern landing page built with Next.js 15, Tailwind CSS and Magic UI that will serve as the homepage for burr.apache.org. Sphinx docs move from / to /docs/ so both coexist. Landing page sections: - Hero with animated stats (GitHub stars, PyPI downloads) - Interactive code terminal with syntax-highlighted examples - Feature highlights (state management, observability, HITL, etc.) - Integration marquee with real SVG logos - Testimonial carousel with existing quotes - Community links (Discord, GitHub, Twitter) - ASF-compliant footer (License, Thanks, Security, Sponsorship, Privacy Policy, Incubator link, trademark attribution, incubation disclaimer) Build & deploy changes: - New unified workflow (build-site.yml) that builds both Next.js and Sphinx, then merges outputs into asf-site branch - Landing page at / and Sphinx docs at /docs/ - sphinx-docs.yml retains build + artifact for PR review only (deploy removed to avoid conflicts) - Sphinx html_baseurl updated to include /docs/ prefix Tech stack: Next.js 15 (App Router), Tailwind CSS v4, shadcn/ui, Magic UI (Marquee, NumberTicker, ShimmerButton, BlurFade, BorderBeam, MagicCard, DotPattern, AnimatedShinyText), shiki for syntax highlighting. Static export for Apache infra compat.
Redirect old root-level Sphinx URLs (concepts/, getting_started/, etc.) to /docs/ with 301s so existing links and search results keep working after the landing page migration. Also fix missing newline at end of globals.css that was failing the pre-commit end-of-file-fixer hook.
…ebsite constants - Add Burr logo to Sphinx docs sidebar, displayed inline with the title - Sidebar brand link points to / (landing page) instead of docs root - Add missing website/src/lib/constants.ts and utils.ts needed by Next.js - Gitignore built Sphinx docs in website/public/docs/
The deploy step used `cp -r ... /*` which skips dotfiles, so .htaccess was never copied to the asf-site branch. Add `shopt -s dotglob` to fix. Also generate static HTML redirect pages by scanning the Sphinx build output at build time, as fallback in case ASF infra does not process .htaccess. See PR apache#679 for context.
Contributor
|
I think you need to rebase? |
Contributor
Author
|
Reopening with a clean branch rebased on main (the original branch had stale commits from the squash-merged #679). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
.htaccessnot being deployed toasf-sitebranch: thecp -r ... /*glob skips dotfiles. Addedshopt -s dotglobbefore the copy..htaccess.Follows up on #679 where old Sphinx paths like
/getting_started/install/started returning 404 after the landing page migration moved docs to/docs/.Test plan
workflow_dispatchand verify.htaccessexists inasf-sitebranchcontent/directoryhttps://burr.apache.org/getting_started/install/redirects to/docs/getting_started/install/#asfinfraSlack) whether.htaccessis honored, then remove the HTML fallback step