Skip to content
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

Jump to bottom

Fixes #17207: Fix 6.1 doc build #705

Merged
merged 1 commit into from
Apr 23, 2020
Merged

Fixes #17207: Fix 6.1 doc build #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ALL_VERSIONS = 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11 3.0 3.1 3.2 4.0 4.1 4.2 4.3 5.0 6.0
ALL_VERSIONS = 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11 3.0 3.1 3.2 4.0 4.1 4.2 4.3 5.0 6.0 6.1
VERSIONS = 5.0 6.0 6.1
VERSION_DOCS = $(addprefix doc-, $(VERSIONS))
VERSION_ARCHIVES = $(addsuffix .archive, $(VERSIONS))
Expand All @@ -9,11 +9,11 @@ SITES = $(GENERIC_DOCS) $(VERSIONS)

LATEST_MAJOR=$(shell curl https://www.rudder-project.org/release-info/rudder/versions/latest)

.PHONY: prepare rudder-theme/build/ui-bundle.zip optipng doc-build changelogs-build build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess build/files $(SITES)
.PHONY: prepare rudder-theme/build/ui-bundle.zip optipng doc-build changelogs-build build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess build/history/6.1/.htaccess build/files $(SITES)
.DEFAULT_GOAL := local

all: $(GENERIC_DOCS) build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess $(VERSION_ARCHIVES) build/files test
online: site site-dev build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess $(VERSION_ARCHIVES) build/files
all: $(GENERIC_DOCS) build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess build/history/6.1/.htaccess $(VERSION_ARCHIVES) build/files test
online: site site-dev build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess build/history/6.1/.htaccess $(VERSION_ARCHIVES) build/files
local: site-local test

rudder-theme/build/ui-bundle.zip:
Expand All @@ -30,6 +30,10 @@ doc-build:
cd $@ && git checkout branches/rudder/6.0 && git pull
cd $@/src/reference && make
cd $@ && git add -f src/reference && git commit --allow-empty -m "Build 6.0"
cd $@ && git clean -fd
cd $@ && git checkout branches/rudder/6.1 && git pull
cd $@/src/reference && make
cd $@ && git add -f src/reference && git commit --allow-empty -m "Build 6.1"

changelogs-build:
[ -d $@ ] || git clone https://github.com/Normation/rudder-doc.git $@
Expand Down Expand Up @@ -68,6 +72,10 @@ build/history/6.0/.htaccess:
mkdir -p build/history/6.0/
echo 'Redirect /rudder-doc/reference/current/ /rudder-doc/reference/6.0/' > $@

build/history/6.1/.htaccess:
mkdir -p build/history/6.1/
echo 'Redirect /rudder-doc/reference/current/ /rudder-doc/reference/6.1/' > $@

# Download documentation files
build/files:
mkdir -p build/files
Expand Down
4 changes: 2 additions & 2 deletions rudder-theme/src/partials/navigation-explore.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<span class="title">Public API reference</span>
<ul class="versions">
<li class="version is-latest">
<a href="https://docs.rudder.io/api/">6.0 (v12)</a>
<a href="https://docs.rudder.io/api/">6.0-6.1 (v12)</a>
</li>
<li class="version">
<a href="https://docs.rudder.io/api/11/">5.0 (v11)</a>
Expand All @@ -49,7 +49,7 @@
<span class="title">Relay API reference</span>
<ul class="versions">
<li class="version is-latest">
<a href="https://docs.rudder.io/api/relay/">6.0 (v1)</a>
<a href="https://docs.rudder.io/api/relay/">6.0-6.1 (v1)</a>
</li>
</ul>
</span>
Expand Down
2 changes: 1 addition & 1 deletion site-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ content:
branches: master
start_path: src/rudder-by-example
- url: ./doc-build
branches: ["branches/rudder/5.0", "branches/rudder/6.0", "master"]
branches: ["branches/rudder/5.0", "branches/rudder/6.0", "branches/rudder/6.1", "master"]
start_path: src/reference
- url: .
branches: master
Expand Down
3 changes: 2 additions & 1 deletion site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ content:
branches: master
start_path: src/rudder-by-example
- url: ./doc-build
branches: ["branches/rudder/5.0", "branches/rudder/6.0"]
branches: ["branches/rudder/5.0", "branches/rudder/6.0", "branches/rudder/6.1"]
start_path: src/reference
- url: ./changelogs-build
branches:
Expand All @@ -35,4 +35,5 @@ content:
- "branches/rudder/4.3"
- "branches/rudder/5.0"
- "branches/rudder/6.0"
- "branches/rudder/6.1"
start_path: src/changelogs