From 4bb4a390c4570ec0538683d83c6ffaa1c34ba5a3 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 00:07:22 -0500
Subject: [PATCH] Further updates

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a429dc..a67eb57 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,11 @@ stages:
 build:
   image: openjdk:8
   stage: build
-  script:
+
+  before_script:
     - export VERSION="$CI_COMMIT_REF_NAME"
+  script:
     - ./gradlew build
-  cache:
-    key: "mangadex_at_home-build"
-    paths:
-      - /root/.gradle
   artifacts:
     name: "mangadex_at_home"
     paths:
@@ -23,8 +21,9 @@ publish:
   image: alpine/git
   stage: publish
 
-  script:
+  before_script:
     - export VERSION="$CI_COMMIT_REF_NAME"
+  script:
     - cp build/libs/mangadex_at_home-${VERSION}-all.jar ./
     - zip -r9 mangadex_at_home-${VERSION}.zip mangadex_at_home-${VERSION}-all.jar settings.sample.yaml
   dependencies:
@@ -46,10 +45,10 @@ publish_docker:
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
+    - export VERSION="$CI_COMMIT_REF_NAME"
   dependencies:
     - build
   script:
-    - export VERSION="$CI_COMMIT_REF_NAME"
     - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
     - docker build . -t ${CI_REGISTRY_IMAGE}:${VERSION}
     - docker push ${CI_REGISTRY_IMAGE}:${VERSION}