From 4ca2a3d1661d82f81c54dcd8f19deb75bff92711 Mon Sep 17 00:00:00 2001
From: LeshaInc <includeurl@gmail.com>
Date: Fri, 30 Aug 2019 20:19:22 +0300
Subject: [PATCH] Fix .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3139854..a0de4a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,24 +10,16 @@ cache:
   key: "$CI_COMMIT_REF_NAME"
   untracked: true
   paths:
-    - "apt-cache/"
     - "sbt-cache/.ivy.cache"
     - "sbt-cache/.boot"
     - "sbt-cache/.sbtboot"
     - "sbt-cache/target"
 
 before_script:
-  - export APT_CACHE_DIR=`pwd`/apt-cache
-  - mkdir -pv $APT_CACHE_DIR
-  - ls $APT_CACHE_DIR || echo "no apt-cache dir found"
-  - apt-get -o dir::cache::archives=$APT_CACHE_DIR update -y
-  - apt-get -o dir::cache::archives=$APT_CACHE_DIR install apt-transport-https -y
-  - mkdir -pv $SBT_CACHE_DIR
-  - ls $SBT_CACHE_DIR || echo "no ivy2 cache fir found"
-  - echo "deb http://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
-  - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 642AC823
-  - apt-get -o dir::cache::archives=$APT_CACHE_DIR update -y
-  - apt-get -o dir::cache::archives=$APT_CACHE_DIR install sbt -y
+  - echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
+  - apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
+  - apt-get update
+  - apt-get install sbt
   - sbt -v sbtVersion
 
 build:
@@ -36,4 +28,4 @@ build:
     - sbt assembly
   artifacts:
     paths:
-      - target/scala-2.12/ocelot-desktop-assembly-*.jar
\ No newline at end of file
+      - target/scala-2.12/ocelot-desktop-assembly-*.jar