From 6c1885cfa6923edf482e27f7b695a22181b1c896 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 11:51:52 +0100
Subject: [PATCH 01/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fc55fa0..3f1fd6cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,12 +18,17 @@ variables:
POSTGRES_PASSWORD: 'password'
POSTGRES_HOST_AUTH_METHOD: trust
RAILS_ENV: test
-
+
build-job:
stage: build
before_script:
- apk update && apk upgrade && apk add nodejs curl libarchive-tools build-base libpq-dev sqlite-dev libxml2-dev tzdata
- cd hyrax && bundle install --jobs 4 --retry 3
+ - sh ./hyrax/deploy_info.sh
+ - DOCKER_IMAGE_TAG = "${CI_COMMIT_REF_SLUG}_$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed 's|\+00:00$|UTC|g;s|:|-|g')"
+ - export $DOCKER_IMAGE_TAG
+ - echo $DOCKER_IMAGE_TAG
+
script:
- mkdir -p /fits/fits-1.5.5
- curl --fail --location "https://github.com/harvard-lts/fits/releases/download/1.5.5/fits-1.5.5.zip" | bsdtar --extract --directory /fits/fits-1.5.5
--
GitLab
From ab4213bd6538b85c975651b3b589c36256ae2f1e Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 12:01:27 +0100
Subject: [PATCH 02/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f1fd6cb..f82445f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ build-job:
before_script:
- apk update && apk upgrade && apk add nodejs curl libarchive-tools build-base libpq-dev sqlite-dev libxml2-dev tzdata
- cd hyrax && bundle install --jobs 4 --retry 3
- - sh ./hyrax/deploy_info.sh
+ - cd hyrax && sh deploy_info.sh
- DOCKER_IMAGE_TAG = "${CI_COMMIT_REF_SLUG}_$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed 's|\+00:00$|UTC|g;s|:|-|g')"
- export $DOCKER_IMAGE_TAG
- echo $DOCKER_IMAGE_TAG
--
GitLab
From 9b48d6cee5c09491c22758793a290fd9df607a78 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 12:20:36 +0100
Subject: [PATCH 03/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f82445f4..0584600f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,9 @@ stages:
- test
- deploy
+cache:
+ key: ${CI_COMMIT_REF_SLUG}
+
services:
- docker:dind
- postgres:13-alpine
@@ -18,16 +21,13 @@ variables:
POSTGRES_PASSWORD: 'password'
POSTGRES_HOST_AUTH_METHOD: trust
RAILS_ENV: test
-
+
build-job:
stage: build
before_script:
- apk update && apk upgrade && apk add nodejs curl libarchive-tools build-base libpq-dev sqlite-dev libxml2-dev tzdata
- cd hyrax && bundle install --jobs 4 --retry 3
- - cd hyrax && sh deploy_info.sh
- - DOCKER_IMAGE_TAG = "${CI_COMMIT_REF_SLUG}_$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed 's|\+00:00$|UTC|g;s|:|-|g')"
- - export $DOCKER_IMAGE_TAG
- - echo $DOCKER_IMAGE_TAG
+ - cd hyrax && sh deploy_info.sh && cat ./deploy_info.json
script:
- mkdir -p /fits/fits-1.5.5
--
GitLab
From 9f04cd01f02dd771079a12d0622fe03c4f61637f Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 12:38:55 +0100
Subject: [PATCH 04/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0584600f..cc3ae8cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,6 @@ stages:
- test
- deploy
-cache:
- key: ${CI_COMMIT_REF_SLUG}
-
services:
- docker:dind
- postgres:13-alpine
@@ -21,12 +18,31 @@ variables:
POSTGRES_PASSWORD: 'password'
POSTGRES_HOST_AUTH_METHOD: trust
RAILS_ENV: test
+ APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
+ RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
+ APK_PACKAGES: nodejs curl libarchive-tools build-base libpq-dev sqlite-dev libxml2-dev tzdata
+
+cache:
+ key: ${CI_COMMIT_REF_SLUG}
+ paths:
+ - $APK_CACHE_DIR
+ - $RUBY_CACHE_DIR
build-job:
stage: build
before_script:
- - apk update && apk upgrade && apk add nodejs curl libarchive-tools build-base libpq-dev sqlite-dev libxml2-dev tzdata
- - cd hyrax && bundle install --jobs 4 --retry 3
+ - mkdir -p $APK_CACHE_DIR
+ - mkdir -p $RUBY_CACHE_DIR
+ - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
+ - cd hyrax && bundle config set --local path
+
+build-job:
+ stage: build
+ before_script:
+ - mkdir -p $APK_CACHE_DIR
+ - mkdir -p $RUBY_CACHE_DIR
+ - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
+ - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
- cd hyrax && sh deploy_info.sh && cat ./deploy_info.json
script:
--
GitLab
From f6c989bd766bc82c9fa61edbceab03edb9c8733d Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 12:46:34 +0100
Subject: [PATCH 05/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc3ae8cc..7c81bf2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,7 @@ build-job:
- mkdir -p $RUBY_CACHE_DIR
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
+ - pwd && ls
- cd hyrax && sh deploy_info.sh && cat ./deploy_info.json
script:
--
GitLab
From 53a7a73df5678bf61b00bcbde3fcae142069d3c4 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 12:52:29 +0100
Subject: [PATCH 06/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c81bf2b..87989177 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,14 +28,6 @@ cache:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
-build-job:
- stage: build
- before_script:
- - mkdir -p $APK_CACHE_DIR
- - mkdir -p $RUBY_CACHE_DIR
- - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- - cd hyrax && bundle config set --local path
-
build-job:
stage: build
before_script:
@@ -43,8 +35,7 @@ build-job:
- mkdir -p $RUBY_CACHE_DIR
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
- - pwd && ls
- - cd hyrax && sh deploy_info.sh && cat ./deploy_info.json
+ - deploy_info.sh && cat ./deploy_info.json
script:
- mkdir -p /fits/fits-1.5.5
--
GitLab
From c6460977aa46eb4cc4f58cf8e6ae2b42b9c0c42d Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 13:01:37 +0100
Subject: [PATCH 07/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87989177..ffb60bc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ build-job:
- mkdir -p $RUBY_CACHE_DIR
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
- - deploy_info.sh && cat ./deploy_info.json
+ - sh deploy_info.sh && cat ./deploy_info.json
script:
- mkdir -p /fits/fits-1.5.5
--
GitLab
From 22379af347c37322b37606bc22c3ae37da2ee309 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 13:07:47 +0100
Subject: [PATCH 08/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffb60bc9..fba56ac6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,9 @@ build-job:
- mkdir -p $APK_CACHE_DIR
- mkdir -p $RUBY_CACHE_DIR
- 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
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
- - sh deploy_info.sh && cat ./deploy_info.json
+
script:
- mkdir -p /fits/fits-1.5.5
--
GitLab
From e8e3eb2e13108be984515bfd34cd61df4846a687 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 13:10:25 +0100
Subject: [PATCH 09/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fba56ac6..aa46d629 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
RAILS_ENV: test
APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
- APK_PACKAGES: nodejs curl libarchive-tools build-base libpq-dev sqlite-dev libxml2-dev tzdata
+ APK_PACKAGES: nodejs curl libarchive-tools build-base git libpq-dev sqlite-dev libxml2-dev tzdata
cache:
key: ${CI_COMMIT_REF_SLUG}
--
GitLab
From 87a1f7be2bcfb5c954f43b12ab2b3e37847449b5 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 13:31:19 +0100
Subject: [PATCH 10/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa46d629..6d505baa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,8 @@ build-job:
- mkdir -p $RUBY_CACHE_DIR
- 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
+ - export DOCKER_IMAGE_TAG="$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed 's|\+00:00$|UTC|g;s|:|-|g')"
+ - echo $DOCKER_IMAGE_TAG
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
--
GitLab
From 456aaf0f5dd6805357b03b7a870e2d8501ec5028 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 13:39:33 +0100
Subject: [PATCH 11/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d505baa..9dc705e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
RAILS_ENV: test
APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
- APK_PACKAGES: nodejs curl libarchive-tools build-base git libpq-dev sqlite-dev libxml2-dev tzdata
+ APK_PACKAGES: nodejs curl libarchive-tools build-base git jq libpq-dev sqlite-dev libxml2-dev tzdata
cache:
key: ${CI_COMMIT_REF_SLUG}
--
GitLab
From a42a60277aa268632c6a5f334dafe9d929abc031 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 24 Mar 2025 13:50:41 +0100
Subject: [PATCH 12/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dc705e0..cc577058 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ build-job:
- mkdir -p $RUBY_CACHE_DIR
- 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
- - export DOCKER_IMAGE_TAG="$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed 's|\+00:00$|UTC|g;s|:|-|g')"
+ - export DOCKER_IMAGE_TAG="$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed -E 's|\+00:00$|UTC|g;s|:|-|g')"
- echo $DOCKER_IMAGE_TAG
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
--
GitLab
From a9da9748607f6f24842f225465c7b08ebf7784fd Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Thu, 27 Mar 2025 11:28:12 +0100
Subject: [PATCH 13/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc577058..188ce890 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,26 +20,27 @@ variables:
RAILS_ENV: test
APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
- APK_PACKAGES: nodejs curl libarchive-tools build-base git jq libpq-dev sqlite-dev libxml2-dev tzdata
-
+
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
+before_script:
+ - mkdir -p $APK_CACHE_DIR
+ - mkdir -p $RUBY_CACHE_DIR
build-job:
stage: build
+ variables:
+ APK_PACKAGES: nodejs curl libarchive-tools build-base git jq libpq-dev sqlite-dev libxml2-dev tzdata
before_script:
- - mkdir -p $APK_CACHE_DIR
- - mkdir -p $RUBY_CACHE_DIR
- 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
- export DOCKER_IMAGE_TAG="$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed -E 's|\+00:00$|UTC|g;s|:|-|g')"
- echo $DOCKER_IMAGE_TAG
- cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
-
-
+
script:
- mkdir -p /fits/fits-1.5.5
- curl --fail --location "https://github.com/harvard-lts/fits/releases/download/1.5.5/fits-1.5.5.zip" | bsdtar --extract --directory /fits/fits-1.5.5
@@ -48,10 +49,12 @@ build-job:
test-job:
stage: test
- coverage: '/coverage: \d+.\d+% of statements/'
+ variables:
+ APK_PACKAGES: bash build-base curl curl-dev gcompat 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/'
before_script:
- - apk update && apk upgrade && apk add bash build-base curl curl-dev gcompat imagemagick imagemagick-libs imagemagick-dev libarchive-tools libpq-dev libxml2-dev libxslt-dev nodejs openjdk11-jre-headless sqlite-dev tzdata yarn
- - cd hyrax && bundle install --jobs 4 --retry 3
+ - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
+ - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
--
GitLab
From 128e97918bedb629672329e454f410f89db96f70 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Thu, 27 Mar 2025 11:38:37 +0100
Subject: [PATCH 14/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 188ce890..063375b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,7 @@
-image: docker:stable
+default:
+ before_script:
+ - docker infoimage: docker:stable
+
image: ruby:2.7.8-alpine
stages:
--
GitLab
From 46cc51bcd7e4580e5211573fa39e3f5f8717774a Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Thu, 27 Mar 2025 11:40:01 +0100
Subject: [PATCH 15/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 063375b5..9bcfecf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
default:
before_script:
- - docker infoimage: docker:stable
-
+ - docker info
+
+image: docker:stable
image: ruby:2.7.8-alpine
stages:
--
GitLab
From 137f75546e55473b800980c6f00152c3e7f2fbe3 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Thu, 27 Mar 2025 11:43:18 +0100
Subject: [PATCH 16/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bcfecf4..54ff0da0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,4 @@
-default:
- before_script:
- - docker info
-
+
image: docker:stable
image: ruby:2.7.8-alpine
--
GitLab
From da33bd3e95ac3d2a967d36f19b1d3d8d3644ddef Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Fri, 28 Mar 2025 11:58:52 +0100
Subject: [PATCH 17/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54ff0da0..e4d2332c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,8 +59,14 @@ test-job:
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
-
+ - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec -format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+ artifacts:
+ when: always
+ paths:
+ - rspec.xml
+ reports:
+ junit: rspec.xml
+
deploy-job:
stage: deploy
script:
--
GitLab
From 0a8f4061d8e975dce483144fa02836bcd081c17a Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Fri, 28 Mar 2025 12:28:39 +0100
Subject: [PATCH 18/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4d2332c..77d1136c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ build-job:
test-job:
stage: test
variables:
- APK_PACKAGES: bash build-base curl curl-dev gcompat imagemagick imagemagick-libs imagemagick-dev libarchive-tools libpq-dev libxml2-dev libxslt-dev nodejs openjdk11-jre-headless sqlite-dev tzdata yarn
+ 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/'
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
@@ -64,6 +64,8 @@ test-job:
when: always
paths:
- rspec.xml
+ - solr-8.11.2.zip
+ - tmp/lexvo_2013-02-09.rdf.gz
reports:
junit: rspec.xml
--
GitLab
From 0a3da86fe9128e6175062bb02915abf9d8d77da3 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 10:17:11 +0200
Subject: [PATCH 19/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77d1136c..b279826d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,9 +63,9 @@ test-job:
artifacts:
when: always
paths:
- - rspec.xml
- - solr-8.11.2.zip
- - tmp/lexvo_2013-02-09.rdf.gz
+ - hyrax/rspec.xml
+ - hyrax/solr-8.11.2.zip
+ - hyrax/tmp/lexvo_2013-02-09.rdf.gz
reports:
junit: rspec.xml
--
GitLab
From b926ced2a49528fcb3af94a8fb27d62e42c2e922 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 10:20:17 +0200
Subject: [PATCH 20/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b279826d..7fabfd44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ services:
- redis:6
variables:
+ CI_DEBUG_TRACE: "true"
POSTGRES_DB: 'hyrax_test'
POSTGRES_DB_TEST: 'hyrax_test'
POSTGRES_USER: 'postgres'
--
GitLab
From b37947f26db7ecc813cbe77aebe4e71d8fd25c71 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 10:39:27 +0200
Subject: [PATCH 21/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fabfd44..5ba63ab3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,8 @@ test-job:
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec -format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+ - pwd
+ - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec -format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
artifacts:
when: always
paths:
--
GitLab
From 1225f020be81a511a1ec079b1abffa644d5bb215 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 14:55:47 +0200
Subject: [PATCH 22/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ba63ab3..7a4c1b9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,8 +60,7 @@ test-job:
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- - pwd
- - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec -format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+ - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
artifacts:
when: always
paths:
--
GitLab
From f89f32698a4e5fe439ec16d53c618d996be54342 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 15:22:11 +0200
Subject: [PATCH 23/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a4c1b9a..6e0390d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ test-job:
coverage: '/coverage: \d+.\d+% of statements/'
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
- - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
+ - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && bundle install --jobs 4 --retry 3 rspec_junit_formatter
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
@@ -65,10 +65,14 @@ test-job:
when: always
paths:
- hyrax/rspec.xml
- - hyrax/solr-8.11.2.zip
- - hyrax/tmp/lexvo_2013-02-09.rdf.gz
reports:
junit: rspec.xml
+ cache:
+ untracked: true
+ when: always
+ paths:
+ - $CI_PROJECT_DIR/hyrax/solr-8.11.2.zip
+ - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf.gz
deploy-job:
stage: deploy
--
GitLab
From 308c8510cafa0f32660571702348c47495f1d452 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 15:35:32 +0200
Subject: [PATCH 24/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e0390d0..f32c5084 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ test-job:
coverage: '/coverage: \d+.\d+% of statements/'
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
- - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && bundle install --jobs 4 --retry 3 rspec_junit_formatter
+ - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && gen install rspec_junit_formatter
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
@@ -68,9 +68,12 @@ test-job:
reports:
junit: rspec.xml
cache:
+ key: ${CI_COMMIT_REF_SLUG}
untracked: true
when: always
- paths:
+ paths:
+ - $APK_CACHE_DIR
+ - $RUBY_CACHE_DIR
- $CI_PROJECT_DIR/hyrax/solr-8.11.2.zip
- $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf.gz
--
GitLab
From bef6cdbeadf3f2f0bf7d41493a18a630f0384b42 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Mon, 31 Mar 2025 15:40:45 +0200
Subject: [PATCH 25/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f32c5084..397fc61e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ test-job:
coverage: '/coverage: \d+.\d+% of statements/'
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
- - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && gen install rspec_junit_formatter
+ - 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
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
--
GitLab
From 6047e8f877ef0c67bb851e6398b5cc74917ed6e1 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 09:57:27 +0200
Subject: [PATCH 26/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 397fc61e..fa882a09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ services:
- redis:6
variables:
- CI_DEBUG_TRACE: "true"
+# CI_DEBUG_TRACE: "true"
POSTGRES_DB: 'hyrax_test'
POSTGRES_DB_TEST: 'hyrax_test'
POSTGRES_USER: 'postgres'
@@ -60,6 +60,7 @@ test-job:
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
+ - pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
artifacts:
when: always
--
GitLab
From 2c8c9a7b73399d81ff63395161b757e4fb6ac038 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 10:11:23 +0200
Subject: [PATCH 27/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa882a09..e8d58cea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ test-job:
paths:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
- - $CI_PROJECT_DIR/hyrax/solr-8.11.2.zip
+ - $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/solr-8.11.2.zip
- $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf.gz
deploy-job:
--
GitLab
From 021c2cf43c0fc0d6996fc5201c6a2cfc87d9109c Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 10:11:59 +0200
Subject: [PATCH 28/57] Edit solr_wrapper_test.yml
---
hyrax/config/solr_wrapper_test.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/hyrax/config/solr_wrapper_test.yml b/hyrax/config/solr_wrapper_test.yml
index 341336ef..03c1bf58 100644
--- a/hyrax/config/solr_wrapper_test.yml
+++ b/hyrax/config/solr_wrapper_test.yml
@@ -2,6 +2,7 @@
version: 8.11.2
port: 8985
instance_dir: tmp/solr-test
+download_dir: tmp/solr-test/download
solr_options: {
force: true
}
--
GitLab
From ca49c5e3dd84a78d0d9cab63fad33fae1ef68b5b Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 10:37:54 +0200
Subject: [PATCH 29/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8d58cea..e6936be3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,6 +62,7 @@ test-job:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/*
artifacts:
when: always
paths:
@@ -76,6 +77,7 @@ test-job:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
- $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/solr-8.11.2.zip
+ - $CI_PROJECT_DIR/hyrax/tmp/fcrepo4-test-data/download/
- $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf.gz
deploy-job:
--
GitLab
From 15fe672079e0f008b9cf5354c21cc5119e622510 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 10:38:32 +0200
Subject: [PATCH 30/57] Edit fcrepo_wrapper_test.yml
---
hyrax/config/fcrepo_wrapper_test.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/hyrax/config/fcrepo_wrapper_test.yml b/hyrax/config/fcrepo_wrapper_test.yml
index 77f79a6e..e8fb7278 100644
--- a/hyrax/config/fcrepo_wrapper_test.yml
+++ b/hyrax/config/fcrepo_wrapper_test.yml
@@ -2,3 +2,4 @@
port: 8986
enable_jms: false
fcrepo_home_dir: tmp/fcrepo4-test-data
+download_dir: tmp/fcrepo4-test-data/download
--
GitLab
From 3be434a03da7c45092cd0c8c65d12a6ab6bbf7e8 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 10:58:33 +0200
Subject: [PATCH 31/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6936be3..f6afe98f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,9 +76,9 @@ test-job:
paths:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
- - $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/solr-8.11.2.zip
+ - $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/
- $CI_PROJECT_DIR/hyrax/tmp/fcrepo4-test-data/download/
- - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf.gz
+ - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
deploy-job:
stage: deploy
--
GitLab
From f14e9cfb97bbdc10738d54073e42a1d7e5e21250 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 11:32:17 +0200
Subject: [PATCH 32/57] Edit solr_wrapper_valkyrie_test.yml
---
hyrax/config/solr_wrapper_valkyrie_test.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/hyrax/config/solr_wrapper_valkyrie_test.yml b/hyrax/config/solr_wrapper_valkyrie_test.yml
index 226a6748..8eda57f9 100644
--- a/hyrax/config/solr_wrapper_valkyrie_test.yml
+++ b/hyrax/config/solr_wrapper_valkyrie_test.yml
@@ -1,6 +1,7 @@
# config/solr_wrapper_valkyrie_test.yml
port: 8987
instance_dir: tmp/solr-valkyrie-test
+download_dir: tmp/solr-valkyrie-test/download
collection:
persist: false
dir: solr/conf
--
GitLab
From fd895a9822cb0cf249fce0039a5c2d5a232b14fe Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 11:58:29 +0200
Subject: [PATCH 33/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6afe98f..874f8622 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ test-job:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/*
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
artifacts:
when: always
paths:
@@ -77,6 +77,7 @@ test-job:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
- $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/
+ - $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/
- $CI_PROJECT_DIR/hyrax/tmp/fcrepo4-test-data/download/
- $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
--
GitLab
From 215d52e4e22ebf87e82e9ae3672d76482c2e8e07 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 12:07:39 +0200
Subject: [PATCH 34/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 874f8622..5a4e329d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@ cache:
before_script:
- mkdir -p $APK_CACHE_DIR
- mkdir -p $RUBY_CACHE_DIR
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
build-job:
stage: build
--
GitLab
From afe5919c23560f001ffdeef617e3efe42872f156 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 12:23:28 +0200
Subject: [PATCH 35/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a4e329d..9e00a1c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,10 +56,12 @@ test-job:
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/'
before_script:
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- 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
script:
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
--
GitLab
From 868ef2ce6a1bec98659461457de8fa3a888d5ba0 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 1 Apr 2025 12:48:15 +0200
Subject: [PATCH 36/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e00a1c0..3566a0ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ cache:
before_script:
- mkdir -p $APK_CACHE_DIR
- mkdir -p $RUBY_CACHE_DIR
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
build-job:
stage: build
@@ -56,16 +56,16 @@ test-job:
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/'
before_script:
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- 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
script:
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/ $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr*/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
artifacts:
when: always
paths:
--
GitLab
From cb305314c1a41eb07707a0fe23502ff636ac4285 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 14:27:03 +0200
Subject: [PATCH 37/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3566a0ab..00b63697 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,6 @@ test-job:
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/'
before_script:
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- 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
--
GitLab
From 22e7b4b03b77e315ef3cb08051d16ddb11b825d0 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 14:40:30 +0200
Subject: [PATCH 38/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00b63697..e9b52dd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,15 +22,28 @@ variables:
RAILS_ENV: test
APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
+ TEST_SOLR_DOWNLOAD_DIR: $CI_PROJECT_DIR/hyrax/tmp/solr-test/download
+ 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_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
+ - mkdir -p $TEST_SOLR_DOWNLOAD_DIR
+ - mkdir -p $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
+ - mkdir -p $TEST_FCREPO_DOWNLOAD_DIR
- pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
build-job:
@@ -71,17 +84,6 @@ test-job:
- hyrax/rspec.xml
reports:
junit: rspec.xml
- cache:
- key: ${CI_COMMIT_REF_SLUG}
- untracked: true
- when: always
- paths:
- - $APK_CACHE_DIR
- - $RUBY_CACHE_DIR
- - $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/
- - $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/
- - $CI_PROJECT_DIR/hyrax/tmp/fcrepo4-test-data/download/
- - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
deploy-job:
stage: deploy
--
GitLab
From 671d6f169c55cad8d65109df50ea08241316b57f Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 14:49:57 +0200
Subject: [PATCH 39/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9b52dd4..d83142dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,6 @@ test-job:
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/'
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
- 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
script:
--
GitLab
From b54a5ebb1c5303947d63f6d572b43f790cb79412 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 15:03:11 +0200
Subject: [PATCH 40/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d83142dc..83e55369 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ variables:
RAILS_ENV: test
APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
+ FITS_DIR: $CI_PROJECT_DIR/hyrax//fits/fits-1.5.5
TEST_SOLR_DOWNLOAD_DIR: $CI_PROJECT_DIR/hyrax/tmp/solr-test/download
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
@@ -36,7 +37,9 @@ cache:
- $TEST_SOLR_DOWNLOAD_DIR
- $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- $TEST_FCREPO_DOWNLOAD_DIR
- - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
+ - $CI_PROJECT_DIR/hyrax/tmp/
+ files:
+ - lexvo_2013-02-09.rdf
before_script:
- mkdir -p $APK_CACHE_DIR
--
GitLab
From be0bf144897f0d9cfeae103b5f04ab9dd59a955d Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 15:10:24 +0200
Subject: [PATCH 41/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83e55369..cbb7f407 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ variables:
TEST_FCREPO_DOWNLOAD_DIR: CI_PROJECT_DIR/hyrax/tmp/fcrepo4-test-data/download
cache:
- key: ${CI_COMMIT_REF_SLUG}
+ key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
untracked: true
when: always
paths:
@@ -37,9 +37,7 @@ cache:
- $TEST_SOLR_DOWNLOAD_DIR
- $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- $TEST_FCREPO_DOWNLOAD_DIR
- - $CI_PROJECT_DIR/hyrax/tmp/
- files:
- - lexvo_2013-02-09.rdf
+ - $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
before_script:
- mkdir -p $APK_CACHE_DIR
--
GitLab
From 73816001b6fb4ec37794f60ac6228b4df7c5b88b Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 15:28:19 +0200
Subject: [PATCH 42/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbb7f407..30eb7c17 100644
--- a/.gitlab-ci.yml
+++ b/.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
--
GitLab
From bd992670e908450a5ebf53f5d28172df9da60bf8 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 15:29:36 +0200
Subject: [PATCH 43/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30eb7c17..fccb4ad6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,11 +39,9 @@ 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:
+ cache:
+ key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
+ paths:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
@@ -65,17 +63,17 @@ 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
+ 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
--
GitLab
From 58045c15a4465b0f95643b2a1361d9ee5d50b2a2 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 15:35:25 +0200
Subject: [PATCH 44/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fccb4ad6..b057479e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,14 +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
-before_script:
- - mkdir -p $APK_CACHE_DIR
- - mkdir -p $RUBY_CACHE_DIR
- - mkdir -p $TEST_SOLR_DOWNLOAD_DIR
- - mkdir -p $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- - mkdir -p $TEST_FCREPO_DOWNLOAD_DIR
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
-
build-job:
stage: build
variables:
@@ -44,8 +36,9 @@ build-job:
paths:
- $APK_CACHE_DIR
- $RUBY_CACHE_DIR
-
before_script:
+ - mkdir -p $APK_CACHE_DIR
+ - mkdir -p $RUBY_CACHE_DIR
- 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
- export DOCKER_IMAGE_TAG="$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed -E 's|\+00:00$|UTC|g;s|:|-|g')"
@@ -74,12 +67,13 @@ test-job:
- $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- $TEST_FCREPO_DOWNLOAD_DIR
- $CI_PROJECT_DIR/hyrax/tmp/lexvo_2013-02-09.rdf
-
before_script:
+ - mkdir -p $TEST_SOLR_DOWNLOAD_DIR
+ - mkdir -p $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
+ - mkdir -p $TEST_FCREPO_DOWNLOAD_DIR
- 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
script:
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
--
GitLab
From 9a1c244c1abac04bcc75655ee98377565a65793f Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 15:47:00 +0200
Subject: [PATCH 45/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b057479e..363b234e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,9 @@ test-job:
- mkdir -p $TEST_SOLR_DOWNLOAD_DIR
- mkdir -p $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- mkdir -p $TEST_FCREPO_DOWNLOAD_DIR
+ - mkdir -p $APK_CACHE_DIR
+ - mkdir -p $RUBY_CACHE_DIR
+ - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- 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
script:
--
GitLab
From 7ca789b4940e5590a37b70942cb91b8b5bc05be6 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 16:33:14 +0200
Subject: [PATCH 46/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 363b234e..20e426ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ test-job:
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+ - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
artifacts:
when: always
--
GitLab
From ddfd04f4a52ea5e3b80d04aecf00441bd4bc6c4d Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 16:45:13 +0200
Subject: [PATCH 47/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20e426ec..41fed1aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ test-job:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $CI_PROJECT_DIR/hyrax/tmp/solr-test/download/ $CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download/ $CI_PROJECT_DIR/hyrax/tmp/fcrepo*/download/
+ - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $TEST_SOLR_DOWNLOAD_DIR $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR $TEST_FCREPO_DOWNLOAD_DIR
artifacts:
when: always
paths:
--
GitLab
From b582ca3ba82d567e0877122b4b1469c050bf37d2 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 16:55:17 +0200
Subject: [PATCH 48/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41fed1aa..3c744b95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
image: docker:stable
+ pull_policy: if-not-present
image: ruby:2.7.8-alpine
+ pull_policy: if-not-present
stages:
- build
@@ -80,7 +82,7 @@ test-job:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- - pwd && ls -la $CI_PROJECT_DIR/hyrax/tmp/* $TEST_SOLR_DOWNLOAD_DIR $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR $TEST_FCREPO_DOWNLOAD_DIR
+ - pwd && ls -la $CI_PROJECT_DIR/* $CI_PROJECT_DIR/hyrax/* $CI_PROJECT_DIR/hyrax/tmp/* $TEST_SOLR_DOWNLOAD_DIR $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR $TEST_FCREPO_DOWNLOAD_DIR
artifacts:
when: always
paths:
--
GitLab
From 59bb6a5736fe54eb611dbd2709ddeaa0e52759cb Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 16:56:13 +0200
Subject: [PATCH 49/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c744b95..0d4d2650 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,9 @@
-image: docker:stable
+image:
+ name: docker:stable
pull_policy: if-not-present
-image: ruby:2.7.8-alpine
+image:
+ name: ruby:2.7.8-alpine
pull_policy: if-not-present
stages:
--
GitLab
From 20156551ef6a4e6de272dfc288fc1292f7027042 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 16:59:01 +0200
Subject: [PATCH 50/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d4d2650..38d71ea8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,6 @@
-image:
- name: docker:stable
- pull_policy: if-not-present
-image:
- name: ruby:2.7.8-alpine
- pull_policy: if-not-present
+image: docker:stable
+image: ruby:2.7.8-alpine
stages:
- build
--
GitLab
From 5716b603b643e4d831c329e793fe04c787314902 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 17:05:12 +0200
Subject: [PATCH 51/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38d71ea8..0ed73210 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,7 @@ test-job:
- mkdir -p $TEST_FCREPO_DOWNLOAD_DIR
- mkdir -p $APK_CACHE_DIR
- mkdir -p $RUBY_CACHE_DIR
+ - touch $CI_PROJECT_DIR/hyrax/rspec.xml
- apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- 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
--
GitLab
From 210f302c8ba77e72b31225db158f231f9ee9d8c0 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 17:09:43 +0200
Subject: [PATCH 52/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ed73210..f0d9fd22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,7 @@ test-job:
paths:
- hyrax/rspec.xml
reports:
- junit: rspec.xml
+ junit: hyrax/rspec.xml
deploy-job:
stage: deploy
--
GitLab
From 6b2d2dcc9abae602fe207c550c554042a1d8490a Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Wed, 2 Apr 2025 17:14:56 +0200
Subject: [PATCH 53/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0d9fd22..dae53a29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,9 +79,7 @@ test-job:
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- - pwd && ls -la
- if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- - pwd && ls -la $CI_PROJECT_DIR/* $CI_PROJECT_DIR/hyrax/* $CI_PROJECT_DIR/hyrax/tmp/* $TEST_SOLR_DOWNLOAD_DIR $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR $TEST_FCREPO_DOWNLOAD_DIR
artifacts:
when: always
paths:
--
GitLab
From 2d6a57989a8bff9f496b7b99c4f97409058d7a70 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Thu, 3 Apr 2025 09:47:15 +0200
Subject: [PATCH 54/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dae53a29..5d6858a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ services:
- redis:6
variables:
-# CI_DEBUG_TRACE: "true"
+ CI_DEBUG_TRACE: "true"
POSTGRES_DB: 'hyrax_test'
POSTGRES_DB_TEST: 'hyrax_test'
POSTGRES_USER: 'postgres'
--
GitLab
From de5349a859b1385f3b37f6314622b292961c1fc0 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 8 Apr 2025 12:08:09 +0200
Subject: [PATCH 55/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d6858a8..c46c4947 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,3 @@
-
image: docker:stable
image: ruby:2.7.8-alpine
--
GitLab
From 4932f3db00f54a26156f3e42b5d48f258e5c2cf3 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 8 Apr 2025 12:20:40 +0200
Subject: [PATCH 56/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c46c4947..5e04c22c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,8 @@ test-job:
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
- - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle config set --local path $RUBY_CACHE_DIR && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+ - if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rake rdms:setup_hyrax && bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
+
artifacts:
when: always
paths:
--
GitLab
From 389f5bef1f7716332fb50e61f355b03c1841aab5 Mon Sep 17 00:00:00 2001
From: Johannes Frenzel <johannes.frenzel@gmail.com>
Date: Tue, 8 Apr 2025 12:31:04 +0200
Subject: [PATCH 57/57] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e04c22c..f17d711a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,10 @@ variables:
POSTGRES_PASSWORD: 'password'
POSTGRES_HOST_AUTH_METHOD: trust
RAILS_ENV: test
- APK_CACHE_DIR: $CI_PROJECT_DIR/.cache/apk
- RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache/ruby
+ BUILD_APK_CACHE_DIR: $CI_PROJECT_DIR/.cache_build/apk
+ BUILD_RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache_build/ruby
+ TEST_APK_CACHE_DIR: $CI_PROJECT_DIR/.cache_test/apk
+ TEST_RUBY_CACHE_DIR: $CI_PROJECT_DIR/.cache_test/ruby
FITS_DIR: $CI_PROJECT_DIR/hyrax//fits/fits-1.5.5
TEST_SOLR_DOWNLOAD_DIR: $CI_PROJECT_DIR/hyrax/tmp/solr-test/download
TEST_SOLR_VALKYRIE_DOWNLOAD_DIR: CI_PROJECT_DIR/hyrax/tmp/solr-valkyrie-test/download
@@ -33,16 +35,16 @@ build-job:
cache:
key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
paths:
- - $APK_CACHE_DIR
- - $RUBY_CACHE_DIR
+ - $BUILD_APK_CACHE_DIR
+ - $BUILD_RUBY_CACHE_DIR
before_script:
- - mkdir -p $APK_CACHE_DIR
- - mkdir -p $RUBY_CACHE_DIR
- - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
+ - mkdir -p $BUILD_APK_CACHE_DIR
+ - mkdir -p $BUILD_RUBY_CACHE_DIR
+ - apk update --cache-dir $BUILD_APK_CACHE_DIR && apk upgrade --cache-dir $BUILD_APK_CACHE_DIR && apk add --cache-dir $BUILD_APK_CACHE_DIR $APK_PACKAGES
- sh hyrax/deploy_info.sh && cat ./hyrax/deploy_info.json
- export DOCKER_IMAGE_TAG="$(git describe --all --always --long --tags | sed -e 's|^heads/||' -e 's|/|_|g')_$(jq -r '.last_deployed' < hyrax/deploy_info.json | sed -E 's|\+00:00$|UTC|g;s|:|-|g')"
- echo $DOCKER_IMAGE_TAG
- - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
+ - cd hyrax && bundle config set --local path $BUILD_RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3
script:
- mkdir -p /fits/fits-1.5.5
@@ -60,8 +62,8 @@ test-job:
untracked: true
when: always
paths:
- - $APK_CACHE_DIR
- - $RUBY_CACHE_DIR
+ - $TEST_APK_CACHE_DIR
+ - $TEST_RUBY_CACHE_DIR
- $TEST_SOLR_DOWNLOAD_DIR
- $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- $TEST_FCREPO_DOWNLOAD_DIR
@@ -70,11 +72,11 @@ test-job:
- mkdir -p $TEST_SOLR_DOWNLOAD_DIR
- mkdir -p $TEST_SOLR_VALKYRIE_DOWNLOAD_DIR
- mkdir -p $TEST_FCREPO_DOWNLOAD_DIR
- - mkdir -p $APK_CACHE_DIR
- - mkdir -p $RUBY_CACHE_DIR
+ - mkdir -p $TEST_APK_CACHE_DIR
+ - mkdir -p $TEST_RUBY_CACHE_DIR
- touch $CI_PROJECT_DIR/hyrax/rspec.xml
- - apk update --cache-dir $APK_CACHE_DIR && apk upgrade --cache-dir $APK_CACHE_DIR && apk add --cache-dir $APK_CACHE_DIR $APK_PACKAGES
- - cd hyrax && bundle config set --local path $RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && gem install rspec_junit_formatter
+ - apk update --cache-dir $TEST_APK_CACHE_DIR && apk upgrade --cache-dir $TEST_APK_CACHE_DIR && apk add --cache-dir $TEST_APK_CACHE_DIR $APK_PACKAGES
+ - cd hyrax && bundle config set --local path $TEST_RUBY_CACHE_DIR && bundle install --jobs 4 --retry 3 && gem install rspec_junit_formatter
- bundle exec rake db:setup
script:
- export FITS_PATH=/fits/fits-1.5.5/fits.sh
--
GitLab