Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avalon 7.6.0 Release #5156

Merged
merged 146 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
725d3dd
WIP
cjcolvar Dec 19, 2022
93f3505
Naively change EBUCore.locator to EBUCore.Locator
cjcolvar Dec 19, 2022
24303a0
Naively change EBUCore.filename to EBUCore.resourceFilename
cjcolvar Dec 19, 2022
7661b76
Apply same changes to Derivative model
cjcolvar Dec 19, 2022
870bb61
Naively change EBUCore.identifier to EBUCore.Identifier
cjcolvar Dec 19, 2022
368460a
Test with ruby3 image
cjcolvar Dec 19, 2022
5af0335
Add missing net-smtp dependency
cjcolvar Dec 19, 2022
db05df3
Pin psych to < 4
cjcolvar Dec 19, 2022
80f3418
Upgrade webmock
cjcolvar Dec 19, 2022
e00bdde
Use ActiveTriples branch for compatibility with newer ruby-rdf
cjcolvar Dec 20, 2022
db72017
Use patched fork of edtf-ruby
cjcolvar Jan 9, 2023
0e496fa
Revert directory changes
cjcolvar Jan 9, 2023
b8da6ca
Use released versions of samvera gems (except om which is deprecated …
cjcolvar Jan 30, 2023
ca01e98
Test with ruby 3.2
cjcolvar Jan 30, 2023
d9dcc52
Add back in noid-rails dependency
cjcolvar Jan 30, 2023
b60141a
Use released version of edtf-ruby
cjcolvar Jan 31, 2023
7e522cf
Upgrade sinatra for security patch
cjcolvar Jan 31, 2023
6820337
Test with rails 6.1
cjcolvar Feb 7, 2023
5570832
Fix mediainfo fork
cjcolvar Feb 7, 2023
0d5e3fc
Upgrade pry
cjcolvar Feb 7, 2023
1432008
Updated samvera-persona
cjcolvar Feb 7, 2023
0c6be64
File#exists? -> File#exist?
cjcolvar Feb 7, 2023
1fb3dc9
Fix rspec-rails config
cjcolvar Feb 8, 2023
3074b78
Mark order query as safe SQL
cjcolvar Feb 8, 2023
330140a
Dir#exists? -> Dir#exist?
cjcolvar Feb 8, 2023
53d0e06
Don't modify frozen string, overwrite it
cjcolvar Feb 8, 2023
6330050
Ensure params are strings instead of arrays
cjcolvar Feb 8, 2023
571108f
Fix issue with missing fixture_file_path method
cjcolvar Feb 8, 2023
ed43dc1
Run rails app:update
cjcolvar Feb 8, 2023
a73a6df
Use a non-null cache since some tests require it
cjcolvar Feb 8, 2023
e8b6a65
Explicitly make kwargs into hash for rspec
cjcolvar Feb 8, 2023
d0649de
Avoid negative truncation values
cjcolvar Feb 8, 2023
604cf53
Use active_fedora branch with fix; not sure why rdf-ldp was regressed
cjcolvar Feb 8, 2023
1354aae
Test with rails 7
cjcolvar Feb 8, 2023
f5b9a84
Ran rails app:update
cjcolvar Feb 8, 2023
3f8a3bb
Wrap devise setup in reloader to_prepare
cjcolvar Feb 8, 2023
4dfa6eb
Use Errors#attribute_names instead of #keys
cjcolvar Feb 10, 2023
8117587
Upgrade all dependencies to see if that fixes failing tests
cjcolvar Feb 10, 2023
bd1b81a
Use default auth instead of specifying identity for test environment
cjcolvar Feb 10, 2023
a8eeeaa
Configure identity provider for specific tests
cjcolvar Feb 10, 2023
2ed6567
Define old ebucore predicates because rdf-vocab no longer defines them
cjcolvar Feb 10, 2023
7e1e538
Appease rubocop
cjcolvar Feb 13, 2023
ccbf064
Fix ActiveFedora git reference
cjcolvar Feb 14, 2023
65932cf
Use main branch of active-fedora
cjcolvar Feb 17, 2023
d827514
Merge pull request #5058 from avalonmediasystem/rails7
cjcolvar Feb 17, 2023
82a6386
Drop xray-rails since it is breaking rendering
cjcolvar Feb 17, 2023
cff35d1
Use ruby 3.2 base images
cjcolvar Feb 17, 2023
042f342
Merge pull request #5069 from avalonmediasystem/rails7_tweaks
cjcolvar Feb 17, 2023
e8bcdd7
Fix mediainfo
cjcolvar Feb 17, 2023
db7ae1a
WIP MediaObject to_solr refactor
masaball Jan 11, 2023
21a129c
Move child field indexing to background job
cjcolvar Jan 11, 2023
29764aa
Put job in unique queue
cjcolvar Jan 11, 2023
bec56a6
Fix namespacing
cjcolvar Jan 11, 2023
fc6185b
Further use of solr instead of fedora for aggregating data
cjcolvar Jan 11, 2023
0f7ce92
Fix syntax error and run indexing job in needed tests
cjcolvar Jan 17, 2023
99e49d5
Only enqueue background job if media object has an id
cjcolvar Jan 17, 2023
d012e69
Fix controller tests
cjcolvar Feb 7, 2023
11a81fe
Fix existing tests
cjcolvar Feb 7, 2023
63db1cd
Add job test
cjcolvar Feb 7, 2023
b22aebe
Cleanup
cjcolvar Feb 7, 2023
2e28876
Fix flakey tests
cjcolvar Feb 10, 2023
a819b14
SME with IIIF manifest usage
Dananji Jul 29, 2022
7a2dfac
Use main branch of SME
cjcolvar Feb 17, 2023
98dfbff
Merge pull request #5070 from avalonmediasystem/rails7_tweaks
cjcolvar Feb 17, 2023
9180b03
Merge pull request #5053 from avalonmediasystem/mo_to_solr_refactor
cjcolvar Feb 17, 2023
3f60010
Merge pull request #5051 from avalonmediasystem/sme-with-manifest
cjcolvar Feb 17, 2023
f441593
Increase ruby stack size limit
masaball Feb 21, 2023
63908c7
Add ENV variable for VM stack
masaball Feb 22, 2023
0a42e57
Merge pull request #5072 from avalonmediasystem/masaball-patch-1
cjcolvar Feb 22, 2023
ec09250
Bump iiif_manifest to latest version
masaball Feb 22, 2023
cd0c300
Merge pull request #5076 from avalonmediasystem/iiif-annotation
cjcolvar Feb 22, 2023
2fb1371
Fix missing code in SME IIIF PR (#5051)
Dananji Feb 23, 2023
82a9660
Merge pull request #5077 from avalonmediasystem/fix-missing-code
Dananji Feb 23, 2023
38bf584
Fix two bugs in JSON update API
mbklein Feb 24, 2023
07a8480
WIP HLS caption for iOS
masaball Feb 27, 2023
9e6b71e
Merge pull request #5082 from avalonmediasystem/hls_subtitles
cjcolvar Feb 28, 2023
a197872
Add tests
cjcolvar Feb 28, 2023
da15a78
Use old namespace for bibframe property to align with pre-existing data
cjcolvar Feb 28, 2023
1d484a5
Merge pull request #5081 from avalonmediasystem/json-update-fixes
cjcolvar Feb 28, 2023
72b693b
Merge pull request #5083 from avalonmediasystem/unit_predicate
cjcolvar Feb 28, 2023
872cf73
Avoid modifying frozen string
cjcolvar Mar 1, 2023
37ead16
Ensure MODS data is indexed when media object is indexed
cjcolvar Mar 1, 2023
7696f56
Merge pull request #5085 from avalonmediasystem/indexing_not_indexing
cjcolvar Mar 1, 2023
688c735
Prevent reification when requesting manifest
masaball Mar 2, 2023
2ae2317
Fix bug for expanding filename and hover text
masaball Mar 2, 2023
204f330
Merge pull request #5093 from avalonmediasystem/fix_filename_expand
cjcolvar Mar 7, 2023
b09cd3b
Override SearchService#count to ensure it uses the preferred http met…
cjcolvar Mar 7, 2023
a39d7b2
Clean Up implementation
masaball Feb 28, 2023
905c5d6
Add caption language default setting
masaball Mar 7, 2023
a1f6fb9
Add tests
masaball Mar 7, 2023
b16a7be
Add filtering for captions to HLS manifest
masaball Mar 7, 2023
71fc19c
Use active-fedora branch and update faraday to 2.x
cjcolvar Mar 1, 2023
1e701cd
Use released version of persona
cjcolvar Mar 7, 2023
a7b48b8
Merge pull request #5088 from avalonmediasystem/faraday_update
masaball Mar 9, 2023
e1e5bc5
Merge pull request #5102 from avalonmediasystem/kaminari_post
masaball Mar 9, 2023
4731ce3
Merge pull request #5104 from avalonmediasystem/hls_subtitles
cjcolvar Mar 10, 2023
71f32b7
Add timeout to waveform ffmpeg process
masaball Mar 6, 2023
542f509
Upgrade to latest version of rails
cjcolvar Mar 10, 2023
d1a7306
Bump dependencies with security alerts
cjcolvar Mar 10, 2023
7284e79
Fix waveform service tests
masaball Mar 10, 2023
f258c45
Merge pull request #5105 from avalonmediasystem/ffmpeg-hanging
cjcolvar Mar 10, 2023
c3a8a4a
Merge pull request #5107 from avalonmediasystem/deps_updates
cjcolvar Mar 10, 2023
149f78f
Use defaults and convenience methods in proxy to avoid reindexing to …
cjcolvar Mar 10, 2023
35a5655
Set id/uri translation lambdas for ActiveFedora::File since AF doesn'…
cjcolvar Mar 13, 2023
56ef2ee
Merge pull request #5109 from avalonmediasystem/struct_saving
Dananji Mar 13, 2023
ca5cb72
Add derivative presenter tests
masaball Mar 13, 2023
a49e6e2
Merge pull request #5094 from avalonmediasystem/iiif_reifying
masaball Mar 13, 2023
04a8336
Enqueue media object indexing job when media object and child master …
cjcolvar Mar 13, 2023
4d5f5c9
Strip out childless paths from structural metadata to ensure valid ma…
cjcolvar Mar 14, 2023
85d6bb9
Merge pull request #5113 from avalonmediasystem/valid_structs
cjcolvar Mar 14, 2023
ea962ef
Merge pull request #5111 from avalonmediasystem/parental_indexing
cjcolvar Mar 14, 2023
64ba679
New SME build with bug fixes
Dananji Mar 14, 2023
2c1fab3
Bump version for release
cjcolvar Mar 14, 2023
c32cc5f
Use tagged versions of forked dependencies
cjcolvar Mar 14, 2023
297545d
Update license header and add to files missing it
cjcolvar Mar 14, 2023
0f2cd93
Merge pull request #5114 from avalonmediasystem/new-sme-build
cjcolvar Mar 15, 2023
194dcf6
Merge pull request #5115 from avalonmediasystem/release_prep
masaball Mar 15, 2023
aea5dec
Merge pull request #5116 from avalonmediasystem/develop
masaball Mar 15, 2023
d17e7db
Fix no-icon thumbnail height in browse
Dananji Mar 22, 2023
80433bb
Merge pull request #5122 from avalonmediasystem/thumbnail-fix
cjcolvar Mar 23, 2023
2dd5677
Player exception bug fix
Dananji Mar 23, 2023
85b0c42
Merge pull request #5125 from avalonmediasystem/player-bug-fix
cjcolvar Mar 24, 2023
bd11125
Add executable bit to scripts
cjcolvar Mar 27, 2023
2efd2d3
Merge pull request #5131 from avalonmediasystem/be_seen
cjcolvar Mar 27, 2023
4b2f51e
Use bugfixed browse-everything
cjcolvar Mar 27, 2023
1677156
Merge pull request #5132 from avalonmediasystem/be_seen
cjcolvar Mar 27, 2023
58f8eb1
Bump BE again
cjcolvar Mar 27, 2023
077dae1
Fix player controls getting hidden while scrubbing
Dananji Mar 27, 2023
587bc79
Merge pull request #5133 from avalonmediasystem/be_seen
masaball Mar 28, 2023
25228a6
Merge pull request #5134 from avalonmediasystem/player-bug-fix
cjcolvar Mar 28, 2023
79fd914
Fix player toolbar icons in Android when auto advancing to next section
Dananji Mar 27, 2023
58ca0cd
Pull in ActiveEncode patch version to fix google drive browse-everyth…
cjcolvar Mar 28, 2023
83a6725
Display correct captions for auto advancing video sections in mobile …
Dananji Mar 28, 2023
3e3de20
Merge pull request #5135 from avalonmediasystem/android-player-bug
cjcolvar Mar 28, 2023
ad7d448
Merge pull request #5138 from avalonmediasystem/be_seen
cjcolvar Mar 28, 2023
afb4a9e
Fix for video player aspect ratio change when switching between sections
Dananji Mar 28, 2023
594dbeb
Merge pull request #5139 from avalonmediasystem/player-resize-bug
cjcolvar Mar 29, 2023
f763874
Fix flashing error message in player when scrubbing
Dananji Mar 30, 2023
1367acb
Merge pull request #5142 from avalonmediasystem/player-error-msg
masaball Mar 31, 2023
9a9540d
Remove special handling of childless divs
cjcolvar Mar 31, 2023
4967bc4
Merge pull request #5145 from avalonmediasystem/childless_divs
cjcolvar Mar 31, 2023
d28edd6
Override ActiveFedora and HydraAccessControls to ensure AccessControl…
cjcolvar Mar 31, 2023
949c4ca
Bump rails version for latest security patch
cjcolvar Mar 31, 2023
1ce1b8a
Merge pull request #5144 from avalonmediasystem/apply_all_ac
cjcolvar Mar 31, 2023
d9074de
Merge pull request #5146 from avalonmediasystem/rails_bump
cjcolvar Mar 31, 2023
01591d5
Merge pull request #5147 from avalonmediasystem/develop
cjcolvar Mar 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build:
docker:
# Primary container image where all steps run.
- image: avalonmediasystem/avalon:develop
- image: avalonmediasystem/avalon:7.5.0-dev-ruby3
environment:
- DATABASE_URL=postgresql://postgres@localhost:5432/postgres
- FEDORA_URL=http://localhost:8080/fcrepo/rest
Expand All @@ -31,7 +31,7 @@ jobs:
parameters:
ruby_ver:
description: 'Ruby version'
default: '2.7'
default: '3.1'
type: 'string'
solr_port:
type: string
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
default: 4
docker:
# Primary container image where all steps run.
- image: avalonmediasystem/avalon:develop
- image: avalonmediasystem/avalon:7.5.0-dev-ruby3

working_directory: /home/app/avalon

Expand All @@ -163,10 +163,10 @@ workflows:
build_test_report:
jobs:
- build:
ruby_ver: '2.7'
name: 'Ruby2-7'
ruby_ver: '3.2'
name: 'Ruby3-2'
parallelism: 4
- upload-coverage:
parallelism: 4
requires:
- Ruby2-7
- Ruby3-2
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base stage for building gems
FROM ruby:2.7-bullseye as bundle
FROM ruby:3.2-bullseye as bundle
LABEL stage=build
LABEL project=avalon
RUN apt-get update && apt-get upgrade -y build-essential && apt-get autoremove \
Expand All @@ -19,6 +19,9 @@ COPY Gemfile.lock ./Gemfile.lock
RUN gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" \
&& bundle config build.nokogiri --use-system-libraries

ENV RUBY_THREAD_MACHINE_STACK_SIZE 8388608
ENV RUBY_THREAD_VM_STACK_SIZE 8388608


# Build development gems
FROM bundle as bundle-dev
Expand All @@ -30,7 +33,7 @@ RUN bundle config set --local without 'production' \


# Download binaries in parallel
FROM ruby:2.7-bullseye as download
FROM ruby:3.2-bullseye as download
LABEL stage=build
LABEL project=avalon
RUN curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz | tar xvz -C /usr/bin/
Expand All @@ -43,7 +46,7 @@ RUN apt-get -y update && apt-get install -y ffmpeg


# Base stage for building final images
FROM ruby:2.7-slim-bullseye as base
FROM ruby:3.2-slim-bullseye as base
LABEL stage=build
LABEL project=avalon
RUN echo "deb http://ftp.us.debian.org/debian/ bullseye main contrib non-free" > /etc/apt/sources.list.d/bullseye.list \
Expand Down
29 changes: 15 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ source 'https://rubygems.org'
# Core rails
gem 'bootsnap', require: false
gem 'listen'
gem 'rails', '=6.0.6.1'
gem 'net-smtp', require: false
gem 'psych', '< 4'
gem 'rails', '=7.0.4.3'
gem 'sprockets', '~>3.7.2'
#gem 'sprockets-rails', require: 'sprockets/railtie'
gem 'sqlite3'
Expand All @@ -27,13 +29,13 @@ gem 'uglifier', '>= 1.3.0'
gem 'webpacker'

# Core Samvera
gem 'active-fedora', '~> 13.2', '>= 13.2.5'
gem 'active_fedora-datastreams', '~> 0.4'
gem 'active-fedora', '~> 14.0', '>= 14.0.1'
gem 'active_fedora-datastreams', '~> 0.5'
gem 'hydra-head', '~> 12.0'
gem 'ldp', '~> 1.0.3'
gem 'noid-rails', '~> 3.0.1'
gem 'ldp', '~> 1.1.0'
gem 'noid-rails', '~> 3.1'
gem 'om', git: 'https://github.com/avalonmediasystem/om.git', tag: 'v3.2.0-ruby3'
gem 'rdf-rdfxml'
gem 'rdf-vocab', '< 3.1.5'

# Samvera version pins
gem 'blacklight', '~> 7.25'
Expand All @@ -51,11 +53,11 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
#gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
gem 'bootstrap-toggle-rails'
gem 'bootstrap_form'
gem 'iiif_manifest', '~> 0.6'
gem 'iiif_manifest', '~> 1.3'
gem 'rack-cors', require: 'rack/cors'
gem 'rails_same_site_cookie'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'samvera-persona', '~> 0.3'
gem 'samvera-persona', '~> 0.4', '>= 0.4.1'
gem 'speedy-af', '~> 0.3'

# Avalon Components
Expand All @@ -72,18 +74,18 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
gem "omniauth-saml", "~> 2.0"

# Media Access & Transcoding
gem 'active_encode', '~> 1.0', '>= 1.1.2'
gem 'active_encode', '~> 1.0', '>= 1.1.3'
gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
gem 'fastimage'
gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6.5'
gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", branch: 'avalon_fixes'
gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", tag: 'v0.7.1-avalon'
gem 'rest-client', '~> 2.0'
gem 'roo'
gem 'wavefile', '~> 1.0.1'

# Data Translation & Normalization
gem 'edtf'
gem 'edtf', '>= 3.1.1'
gem 'iconv', '~> 1.0.6'
gem 'marc'

Expand All @@ -92,7 +94,7 @@ gem 'activejob-traffic_control'
gem 'activejob-uniqueness'
gem 'redis-rails'
gem 'sidekiq', '~> 6.2'
gem 'sidekiq-cron', '~> 1.2', git: "https://github.com/avalonmediasystem/sidekiq-cron.git", tag: 'v1.2.1-avalon'
gem 'sidekiq-cron', '~> 1.9'

# Coding Patterns
gem 'config'
Expand All @@ -112,7 +114,6 @@ group :development do
# Use Bixby instead of rubocop directly
gem 'bixby', require: false
gem 'web-console'
gem 'xray-rails'
end

group :development, :test do
Expand Down Expand Up @@ -144,7 +145,7 @@ group :test do
gem 'shoulda-matchers'
gem 'simplecov'
gem 'webdrivers', '~> 3.0'
gem 'webmock', '~> 3.5.1'
gem 'webmock', '~> 3.5'
end

group :production do
Expand Down
Loading