Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
howto-cards LEGACY VERSION
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
R3
howto-cards LEGACY VERSION
Commits
bf752eba
Commit
bf752eba
authored
5 years ago
by
Laurent Heirendt
Browse files
Options
Downloads
Plain Diff
Merge branch 'use_masters_404' into 'develop'
Use master's 404.html See merge request
!40
parents
aeaada5e
d671d6ff
No related branches found
No related tags found
2 merge requests
!41
Regular merge of develop
,
!40
Use master's 404.html
Pipeline
#16544
passed
5 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.ci/deploy.sh
+5
-3
5 additions, 3 deletions
.ci/deploy.sh
with
5 additions
and
3 deletions
.ci/deploy.sh
+
5
−
3
View file @
bf752eba
...
...
@@ -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/.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment