Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -27,18 +27,6 @@ variables:
   TEST_SOLR_VALKYRIE_DOWNLOAD_DIR: CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download
   TEST_FCREPO_DOWNLOAD_DIR: CI_PROJECT_DIR/hyrax/tmp/fcrepo4-test-data/download
  
-cache:
-  key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
-  untracked: true
-  when: always
-  paths: 
-    - $APK_CACHE_DIR
-    - $RUBY_CACHE_DIR
-    - $TEST_SOLR_DOWNLOAD_DIR
-    - $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
-    - $TEST_FCREPO_DOWNLOAD_DIR
-    - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
-
 before_script:
     - mkdir -p $APK_CACHE_DIR
     - mkdir -p $RUBY_CACHE_DIR
@@ -51,6 +39,14 @@ build-job:
   stage: build
   variables:
     APK_PACKAGES: nodejs curl libarchive-tools build-base git jq libpq-dev sqlite-dev libxml2-dev tzdata 
+cache:
+  key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
+  untracked: true
+  when: always
+  paths: 
+    - $APK_CACHE_DIR
+    - $RUBY_CACHE_DIR
+
   before_script:
     - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
     - sh hyrax/deploy_info.sh  && cat ./hyrax/deploy_info.json
@@ -69,6 +65,18 @@ test-job:
   variables:
     APK_PACKAGES: bash build-base curl curl-dev gcompat git imagemagick imagemagick-libs imagemagick-dev libarchive-tools libpq-dev libxml2-dev libxslt-dev nodejs openjdk11-jre-headless sqlite-dev tzdata yarn
     coverage: '/coverage: \d+.\d+% of statements/'
+cache:
+  key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
+  untracked: true
+  when: always
+  paths: 
+    - $APK_CACHE_DIR
+    - $RUBY_CACHE_DIR
+    - $TEST_SOLR_DOWNLOAD_DIR
+    - $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
+    - $TEST_FCREPO_DOWNLOAD_DIR
+    - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
+
   before_script:
     - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && gem install rspec_junit_formatter
     - bundle exec rake db:setup