From caa7ae20b10cef415ac58c4fd900f3a99ae6eb72 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 14 Mar 2021 00:00:44 +0100
Subject: [PATCH] Compress compiled HTML before uploading
---
.gitlab-ci.yml | 10 +++++-----
docker/megacmd/Dockerfile | 9 +++++++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb996556cc2..6fb03dea968 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
- release
variables:
- FC_PREGMOD_HTML: "FC_pregmod_${CI_COMMIT_TAG}.html"
+ FC_PREGMOD_ARCHIVE: "FC_pregmod_${CI_COMMIT_TAG}.zip"
build:
stage: build
@@ -26,9 +26,9 @@ upload:
- if: $CI_COMMIT_TAG =~ /\A\d+\.\d+\.\d+\z/
script:
- mega-login $MEGA_MAIL $MEGA_PWD
- - mv bin/FC_pregmod.html bin/$FC_PREGMOD_HTML
- - mega-put bin/$FC_PREGMOD_HTML /
- - echo "MEGA_URL=$(mega-export -a /$FC_PREGMOD_HTML | grep -o https.*)" >> variables.env
+ - zip bin/$FC_PREGMOD_ARCHIVE bin/FC_pregmod.html
+ - mega-put bin/$FC_PREGMOD_ARCHIVE /
+ - echo "MEGA_URL=$(mega-export -a /$FC_PREGMOD_ARCHIVE | grep -o https.*)" >> variables.env
artifacts:
# carry MEGA_URL over to the release job
reports:
@@ -54,4 +54,4 @@ release:
- |
release-cli create --name "$CI_COMMIT_TAG" --description "$DESCRIPTION" \
--tag-name "$CI_COMMIT_TAG" \
- --assets-link "{\"name\":\"${FC_PREGMOD_HTML}\",\"url\":\"${MEGA_URL}\"}"
+ --assets-link "{\"name\":\"${FC_PREGMOD_ARCHIVE}\",\"url\":\"${MEGA_URL}\"}"
diff --git a/docker/megacmd/Dockerfile b/docker/megacmd/Dockerfile
index d454f095cd5..6b2b1dda7d9 100644
--- a/docker/megacmd/Dockerfile
+++ b/docker/megacmd/Dockerfile
@@ -6,12 +6,17 @@
# Debug build process
# docker build --no-cache --progress=plain -t megacmd .
-#Create debian as base image
+# Create debian as base image
FROM debian
-#Install packages
+# Update
RUN apt-get -y update
RUN apt-get -y upgrade
+
+# Install zip
+RUN apt-get -y install zip
+
+# mega cmd
# Install dependencies, when changing mega versions these may need to be adjusted
RUN apt-get -y install libc-ares2 libcrypto++6 libmediainfo0v5 libpcrecpp0v5 libzen0v5
# Install mega cmd
--
GitLab