Skip to content

Upgrade to GeoBlacklight 4.4.1 #365

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.

Sign up for GitHub

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

Closed
wants to merge 20 commits into from
Closed

Upgrade to GeoBlacklight 4.4.1 #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e8342f5
Go through update steps for GeoBlacklight 4.4.0
spilth Jul 31, 2024
7c78136
Adds missing vite.config.mts
spilth Jul 31, 2024
fe49839
Adds missing base.html.erb
spilth Aug 1, 2024
4009025
Add necessary cog and pmtiles entries
spilth Aug 2, 2024
7ce1fe3
Temporarily use 0.9.1 branch of sdr-cli
spilth Aug 5, 2024
ce41deb
Fix formatting of Gemfile
spilth Aug 6, 2024
2afe72f
Point to SHA of GeoCombine with indexer bug fix
spilth Aug 8, 2024
d1cb473
Fix quoting in Gemfile
spilth Aug 8, 2024
23677cf
Test against sdr-cli with geocombine 0.9.2
spilth Aug 14, 2024
024dde6
Upgrade to fixed geo_combine & sdr_cli
spilth Aug 20, 2024
1ffe395
Upgrade to geoblacklight 4.4.1
spilth Aug 20, 2024
1aaaeb1
Align .gitignore with latest GBL
spilth Aug 20, 2024
65ec8d5
No need for separate geo_combine Gemfile entry
spilth Aug 20, 2024
9efb21c
Align more files with GBL 4.4.1 versions
spilth Aug 20, 2024
1c17f12
Add Node Packages to CI
spilth Aug 21, 2024
4d66fd0
Update VERSION in development environment settings
spilth Aug 21, 2024
bc5ef76
Upgrade expected server Node version to 22.7.0
spilth Aug 26, 2024
94d22ee
Provide override for deploying others branches to staging. Adds deplo…
spilth Aug 26, 2024
4e6de07
Adds missing vite binstub
spilth Aug 27, 2024
b0fcf64
Ensure data-inspect attribute is set on leaflet maps
spilth Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ jobs:
name: test
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 22.7.0
- name: Install NodeJS Dependencies
run: npm ci
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
59 changes: 41 additions & 18 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,48 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
# Temporary files generated by your text editor or operating system
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is me getting our .gitignore in line with GBL's and putting all our customizations after there's. This should hopefully help keep it in sync with any of their forthcoming changes.

# belong in git's global ignore instead:
# `$XDG_CONFIG_HOME/git/ignore` or `~/.config/git/ignore`

# Ignore bundler config.
/.bundle

# Ignore IDE docs
/.idea/*

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal
# Ignore all environment files (except templates).
/.env*
!/.env*.erb

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
/tmp
!/tmp/.keep

# Ignore old migrations
/db/old/*
# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore storage (uploaded files in development and any SQLite databases).
/storage/*
!/storage/.keep
/tmp/storage/*
!/tmp/storage/
!/tmp/storage/.keep

# Ignore assets
/public/assets/*

# Ignore master key for decrypting credentials and more.
/config/master.key

# Vite Ruby
/public/vite*
node_modules
# Vite uses dotenv and suggests to ignore local-only env files. See
# https://vitejs.dev/guide/env-and-mode.html#env-files
*.local

### NYU Specific ###

.byebug_history
*cloudimg-console.log

Expand All @@ -37,11 +55,16 @@
# Ignore google verification
/public/google*.html

.env
.env.*

master.key

config/settings.local.yml
config/settings/*.local.yml
config/environments/*.local.yml

# Ignore IDE docs
/.idea/*

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore old migrations
/db/old/*
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 3.2.2
java openjdk-17
nodejs 22.6.0
nodejs 22.7.0
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem 'capistrano-rbenv', '~> 2.2'
gem 'config'
gem 'dalli'
gem 'devise'
gem 'geoblacklight', '~> 4.0'
gem 'geoblacklight', '~> 4.4.1'
gem 'importmap-rails'
gem 'jbuilder'
gem 'jquery-rails'
Expand All @@ -36,6 +36,7 @@ gem 'turbo-rails'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem 'view_component', '~> 2.83.0'
gem 'vite_rails', '~> 3.0'
gem 'whenever', require: false

group :test do
Expand Down
Loading