Skip to content

Commit

Permalink
Upgrade to GBL 4.4.2 (#371)
Browse files Browse the repository at this point in the history
* Go through update steps for GeoBlacklight 4.4.0
* Adds missing vite.config.mts
* Adds missing base.html.erb
* Add necessary cog and pmtiles entries
* Temporarily use 0.9.1 branch of sdr-cli
* Fix formatting of Gemfile
* Point to SHA of GeoCombine with indexer bug fix
* Fix quoting in Gemfile
* Test against sdr-cli with geocombine 0.9.2
* Upgrade to fixed geo_combine & sdr_cli
* Upgrade to geoblacklight 4.4.1
* Align .gitignore with latest GBL
* No need for separate geo_combine Gemfile entry
* Align more files with GBL 4.4.1 versions
* Add Node Packages to CI
* Update VERSION in development environment settings
* Upgrade expected server Node version to 22.7.0
* Provide override for deploying others branches to staging. Adds deployment documentation
* Adds missing vite binstub
* Ensure data-inspect attribute is set on leaflet maps
* Upgrade to GBL 4.4.2
* Bump GBL version variable to 4.4.2
  • Loading branch information
spilth authored Sep 11, 2024
1 parent c538513 commit 467f880
Show file tree
Hide file tree
Showing 23 changed files with 5,032 additions and 127 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
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
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
# 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
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
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.2'
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

0 comments on commit 467f880

Please sign in to comment.