Skip to content

Commit

Permalink
Merge pull request #2050 from jaimergp/docusaurus-homepage
Browse files Browse the repository at this point in the history
conda-forge.org redesign: Homepage
  • Loading branch information
beckermr authored Jan 4, 2024
2 parents 502fb38 + 373e157 commit afbae33
Show file tree
Hide file tree
Showing 85 changed files with 38,203 additions and 801 deletions.
1 change: 1 addition & 0 deletions .ci_scripts/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ dependencies:
- pip
- python-rapidjson
- termcolor
- nodejs 20.*
55 changes: 0 additions & 55 deletions .ci_scripts/generate_html.py

This file was deleted.

22 changes: 13 additions & 9 deletions .ci_scripts/update_docs
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@
set -ex

# configure bot account
git config --global user.email "pelson.pub+conda-forge@gmail.com"
git config --global user.name "conda-forge-admin"
if [[ "$CI" == "1" ]]; then
git config --global user.email "pelson.pub+conda-forge@gmail.com"
git config --global user.name "conda-forge-admin"
git checkout -b new_site_content
fi

git checkout -b new_site_content

pushd sphinx/newsfeed
pip install --no-deps .
popd

python .ci_scripts/generate_html.py

# build docs into docs
rm -rf docs/

python .ci_scripts/generate_cfep_index.py

pushd sphinx/src
Expand All @@ -32,6 +29,13 @@ if [[ "${GHREF}" != "refs/heads/main" ]]; then
test "$linkcheck_failed" -eq 0
fi

mv _build/html ../../docs
# Move rendered Sphinx docs to a static directory for Docusaurus to use
rm -rf ../../static-sphinx || true
mkdir -p ../../static-sphinx
mv _build/html ../../static-sphinx/docs
rm -rf _build
popd

# Build docusaurus site
npm install
npm run build
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
publish_dir: .
publish_dir: ./build
user_name: conda-forge-admin
user_email: pelson.pub+conda-forge@gmail.com
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,26 @@ elm-stuff
sphinx/rtd/_build
sphinx/rtd/default.profraw
sphinx/newsfeed/demo/_build

# Sphinx output gets moved to Docusaurus' static folder
/static-sphinx

# Docusaurus dependencies
/node_modules

# Docusaurus production
/build

# Generated files
.docusaurus
.cache-loader

# Misc
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
3 changes: 3 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: [require.resolve("@docusaurus/core/lib/babel/preset")],
};
Loading

0 comments on commit afbae33

Please sign in to comment.