Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-12-09 13:29:02 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-12-09 13:29:02 +0300
commita2011e296a0ca324674cf829b4c649f64ba953c9 (patch)
tree492d3bf0e794e6218743cd0e310492e7050c488d /.gitlab-ci.yml
parent6352e9e18f227e8d7785a0f9771d8e8ff9968e0c (diff)
Fix input value of minify when run in pages job
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml26
1 files changed, 24 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee05b131..23b10065 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -280,14 +280,36 @@ pages:
dependencies:
- compile_prod # Contains the public directory
script:
+ #
# We want to use the artifacts of the compile_prod job as
# the latest docs deployment, and the other versions are
# taken from /usr/share/nginx/html which are included in
# the image we pull from.
+ #
- mv /usr/share/nginx/html/1* public/
- # Check the size
+
+ #
+ # Check the size before minifying
+ #
- du -sh public/
- - /scripts/minify-assets.sh public/ public/
+
+ #
+ # Minify the assets of the resulting site. The single versions
+ # will be minified eventually when the minification propagates
+ # to all versions that are included in gitlab-docs:latest
+ # (around 12.7), but we also need to minify the content we
+ # pull from master. Currently, there's no way to exclude
+ # files or directories when minifying, so we minify the whole
+ # site (even the versions that are already minified).
+ # TODO: Move to top.
+ # When all versions are minified, we can move this script
+ # to run first and avoid minifying the already minified versions.
+ #
+ - /scripts/minify-assets.sh ./ public/
+
+ #
+ # Check the size after minifying
+ #
- du -sh public/
artifacts:
paths: