Hyrax v5 test & build PR [DO NOT MERGE]

.circleci/config.yml

@@ -135,8 +135,8 @@ jobs:
           name: Compile imagemagick with jp2 support
           command: |
             mkdir -p /tmp/im && \
-            curl -sL https://www.imagemagick.org/archive/releases/ImageMagick-7.1.0-27.tar.xz \
-            | tar -xJvf - -C /tmp/im && cd /tmp/im/ImageMagick-7.1.0-27 && \
+            curl -sL https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-62.tar.gz \
+            | tar -xz -C /tmp/im && cd /tmp/im/ImageMagick-7.1.0-62 && \
               ./configure \
                 --build=$CBUILD \
                 --host=$CHOST \
@@ -232,7 +232,7 @@ jobs:
             export APP_VERSION=$(cat lib/oregon_digital/version.rb | grep VERSION | cut -d "=" -f 2 | sed "s/['\" ]//g")
             export GIT_SHORT_HASH=$(git rev-parse --short HEAD)
             export DATETIME=$(date "+%Y%m%d%H%M")
-            export TAG="$DATETIME-$GIT_SHORT_HASH"
+            export TAG="$DATETIME-$GIT_SHORT_HASH-v5"
             export DEPLOYED_VERSION="$DATETIME-$GIT_SHORT_HASH"
             echo export RAILS_ENV="$RAILS_ENV" >> $BASH_ENV
             echo export TAG="$TAG" >> $BASH_ENV
@@ -276,23 +276,24 @@ workflows:
       - lint:
           requires:
             - bundle
-      - test:
-          requires:
-            - lint
-          filters:
-            branches:
-              ignore:
-                - master
+      # - test:
+      #     requires:
+      #       - lint
+      #     filters:
+      #       branches:
+      #         ignore:
+      #           - master
       - build_and_push_beavernetes:
           name: Build and push application image to Beavernetes image repository
           requires:
             - lint
-            - test
+            # - test
           filters:
             branches:
               only:
                 - master
                 - /infra\/.*/
                 - /staging\/.*/
+                - /update\/.*/
           repo: od2_web
           environment: production

.irbrc

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+IRB.conf[:USE_AUTOCOMPLETE] = false

Dockerfile

@@ -12,7 +12,7 @@ FROM bundler AS dependencies
 RUN apt update && apt -y upgrade && \
   apt -y install nodejs unzip ghostscript vim less tmux yarnpkg curl wget openssl \
   git sqlite3 postgresql-client libpq-dev libjpeg62-turbo-dev libpng-dev libtool libgomp1 \
-  build-essential zip xz-utils autoconf automake libtool texinfo libltdl7 \
+  build-essential gcc zip xz-utils autoconf automake libtool texinfo libltdl7 \
   bash bash-completion java-common openjdk-17-jre-headless graphicsmagick ffmpeg \
   poppler-utils tesseract-ocr libopenjp2-7-dev libopenjp2-tools libopenjp2-7 \
   libffi-dev tini libxslt1-dev libxml2-dev tzdata lsb-release cmake mediainfo libmediainfo-dev
@@ -26,8 +26,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 # Install ImageMagick with jp2/tiff support
 # Install ImageMagick with full support
 RUN mkdir -p /tmp/im && \
-  curl -sL https://www.imagemagick.org/archive/releases/ImageMagick-7.1.0-27.tar.xz \
-  | tar -xJvf - -C /tmp/im && cd /tmp/im/ImageMagick-7.1.0-27 && \
+  curl -sL https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-62.tar.gz \
+  | tar -xz -C /tmp/im && cd /tmp/im/ImageMagick-7.1.0-62 && \
   ./configure \
   --build=$CBUILD \
   --host=$CHOST \

Gemfile

@@ -18,7 +18,7 @@ gem 'dalli', '~> 3.2.3'
 gem 'devise'
 gem "edtf", "~> 3.0"
 gem 'hydra-role-management'
-gem 'hyrax', '~> 4.0'
+gem 'hyrax', '~> 5.2'
 # gem 'hyrax-migrator', github: 'OregonDigital/hyrax-migrator', branch: 'master'
 gem 'jquery-rails'
 gem 'sassc-rails'
@@ -77,7 +77,7 @@ gem 'blacklight_oai_provider'
 
 group :development do
   # listen is a requirement of puma but isn't part of its gemspec
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'listen'
   gem 'web-console', '>= 3.3.0'
 end