Skip to content

Deploy develop branch documentation to /develop subpath #1220

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
ReeceHumphreys merged 2 commits into from
Jan 6, 2026
+16 −5
Merged

Deploy develop branch documentation to /develop subpath #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41d5399
Update workflow to deploy to multiple destinations
ReeceHumphreys Jan 4, 2026
8518285
Update release notes
ReeceHumphreys Jan 4, 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
19 changes: 14 additions & 5 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Merge to develop
name: Merge to master or develop

on:
push:
branches: [develop]
branches: [master, develop]
workflow_dispatch:

permissions:
Expand All @@ -29,10 +29,19 @@ jobs:
conan-args: --opNav True --allOptPkg --mujoco True --mujocoReplay True
- name: Build docs
uses: ./.github/actions/docs
- name: Deploy
if: ${{ success() }} # deploy only if prior steps ok
- name: Deploy master branch merges to /
if: success() && github.ref_name == 'master'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/build/html
force_orphan: true
destination_dir: .
keep_files: true
- name: Deploy develop branch merges to /develop
if: success() && github.ref_name == 'develop'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/build/html
destination_dir: develop
keep_files: true
2 changes: 2 additions & 0 deletions docs/source/Support/bskReleaseNotes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Basilisk Release Notes

Version |release|
-----------------
- Updated merge workflow to deploy develop branch documentation to https://avslab.github.io/basilisk/develop and master
branch documentation to https://avslab.github.io/basilisk.
- Migrated supportData handling to a Pooch-based fetch system.
.. warning::

Expand Down
Loading