Skip to content

Commit f463b93

Browse files
authored
Merge pull request #31 from sandialabs/dev-cicd-docs
update the base url for Jupyter book based on main versus dev branch
2 parents 019fc31 + c8e0abb commit f463b93

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ on:
1313
- "dev*" # Explicity include branches with "dev" in the name (e.g., dev, dev-feature, etc.)
1414
env:
1515
# `BASE_URL` determines the website is served from, including CSS & JS assets
16-
# You may need to change this to `BASE_URL: ''`
17-
BASE_URL: /${{ github.event.repository.name }}/book/jupyter/
16+
# This is dynamically set based on the branch to ensure correct pathing on GitHub Pages
17+
BASE_URL: /${{ github.event.repository.name }}/${{ github.ref == 'refs/heads/main' && 'main' || 'dev' }}/book/jupyter/
1818

1919
jobs:
2020
lint:
@@ -309,14 +309,14 @@ jobs:
309309
<h1>Rattlesnake Vibration Controller - CI/CD Hub</h1>
310310
<p>Access the latest documentation and quality reports for both the stable and development versions.</p>
311311
312-
<h2>🚀 Released (Main Branch)</h2>
312+
<h2>🚀 Released ([Main Branch](https://github.com/sandialabs/rattlesnake-vibration-controller/tree/main?tab=readme-ov-file)</h2>
313313
<ul>
314-
<li><a href="main/book/jupyter/index.html">User's Manual</a> <span class="badge badge-main">stable</span></li>
315-
<li><a href="main/reports/pylint/index.html">Pylint Report</a></li>
316-
<li><a href="main/reports/coverage/index.html">Pytest Coverage</a></li>
314+
<li><a href="main/book/jupyter/index.html">User's Manual (work in progress)</a> <span class="badge badge-main">stable</span></li>
315+
<li><a href="main/reports/pylint/index.html">Pylint Report (work in progress)</a></li>
316+
<li><a href="main/reports/coverage/index.html">Pytest Coverage (work in progress)</a></li>
317317
</ul>
318318
319-
<h2>🛠️ Development (Dev Branch)</h2>
319+
<h2>🛠️ Development ([Dev Branch](https://github.com/sandialabs/rattlesnake-vibration-controller/tree/dev?tab=readme-ov-file))</h2>
320320
<ul>
321321
<li><a href="dev/book/jupyter/index.html">User's Manual</a> <span class="badge badge-dev">latest</span></li>
322322
<li><a href="dev/reports/pylint/index.html">Pylint Report</a></li>

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
[![GitHub license](https://img.shields.io/badge/license-GNU-blue.svg)](https://github.com/sandialabs/rattlesnake-vibration-controller/blob/main/LICENSE)
99

1010
[![GitHub Pages badge](https://img.shields.io/badge/GitHub%20Pages-blueviolet?logo=github)](https://sandialabs.github.io/rattlesnake-vibration-controller/)
11+
<!--
1112
[![Pylint Report badge](https://img.shields.io/badge/Pylint%20Report-blue)](https://sandialabs.github.io/rattlesnake-vibration-controller/main/reports/pylint/) [![Coverage Report badge](https://img.shields.io/badge/Coverage%20Report-blue)](https://sandialabs.github.io/rattlesnake-vibration-controller/main/reports/coverage/)
13+
-->
1214

1315
## Overview
1416

@@ -24,7 +26,7 @@ Rattlesnake can be run as a Python script using the code from this repository, o
2426
See the documentation for more information:
2527

2628
* Rattlesnake User's Manual
27-
* [Released](https://sandialabs.github.io/rattlesnake-vibration-controller/main/book/jupyter/index.html) ![branch-main](https://img.shields.io/badge/branch-main-blue)
29+
* (Work in progress) [Released](https://sandialabs.github.io/rattlesnake-vibration-controller/main/book/jupyter/index.html) ![branch-main](https://img.shields.io/badge/branch-main-blue)
2830
* [Development](https://sandialabs.github.io/rattlesnake-vibration-controller/dev/book/jupyter/index.html) ![branch-dev](https://img.shields.io/badge/branch-dev-orange)
2931
* Rattlesnake User's Manual, Version 3, SAND2024-14378, Oct 2024. [Download](https://github.com/sandialabs/rattlesnake-vibration-controller/releases/download/v3.0.0/Rattlesnake.pdf) (78 MB)
3032

0 commit comments

Comments
 (0)