Commit bf752eba authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'use_masters_404' into 'develop'

Use master's 404.html

See merge request R3/howto-cards!40
parents aeaada5e d671d6ff
Pipeline #16544 passed with stage
in 1 minute and 19 seconds
......@@ -17,6 +17,11 @@ for branch in $(git for-each-ref --format='%(refname:strip=3)' refs/remotes); do
# build the website
bundle exec jekyll build --baseurl="howto-cards/$artefact" -d "public/$artefact"
if [[ $branch == "master" ]]; then
# set the 404
cp howto-cards/$artefact/404.html public/404.html
fi
done
# checkout the current branch
......@@ -26,6 +31,3 @@ git reset --hard origin/$CI_COMMIT_REF_NAME
# set the auto redirection
cp .ci/.autoRedirect public/index.html
# set the 404
cp 404.html public/.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment