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 #17962: Build 6.2 embedded doc #766

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Fixes #17962: Build 6.2 embedded doc #766

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions 6.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
site:
title: Rudder 6.2 Documentation
start_page: get-started::home
output:
dir: ./build/history/6.2
content:
sources:
- url: .
branches: master
start_path: src/get-started
- url: .
branches: master
start_path: src/rudder-by-example
- url: ./doc-build
branches: "master"
start_path: src/reference

18 changes: 13 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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
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 6.2
VERSIONS = 5.0 6.0 6.1 6.2
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/history/6.1/.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/history/6.2/.htaccess build/files $(SITES)
.DEFAULT_GOAL := local

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
all: $(GENERIC_DOCS) build/sites/site/.htaccess build/history/5.0/.htaccess build/history/6.0/.htaccess build/history/6.1/.htaccess build/history/6.2/.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 build/history/6.2/.htaccess $(VERSION_ARCHIVES) build/files
local: site-local test

rudder-theme/build/ui-bundle.zip:
Expand All @@ -34,6 +34,10 @@ doc-build:
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"
cd $@ && git clean -fd
cd $@ && git checkout master && git pull
cd $@/src/reference && make
cd $@ && git add -f src/reference && git commit --allow-empty -m "Build 6.2"

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

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

# Download documentation files
build/files:
mkdir -p build/files
Expand Down