Skip to content

Commit

Permalink
bump Version to Hyrax 4.0.0-rc2 (#6051)
Browse files Browse the repository at this point in the history
* bump Version to Hyrax 4.0.0-rc2

* change legacy readme to reflect current ruby version support

should this readme be removed?
  • Loading branch information
tamsin johnson authored May 1, 2023
1 parent 82c097f commit e5e446b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions CONTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Our goal is to provide a practical, reusable reference environment for applicati

The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).

There are two options for development environments to run:
There are two options for development environments to run:

- [Dassie](#dassie-internal-test-app-with-activefedora) is the default internal test app that will run an ActiveFedora-based Hyrax web application using Fedora 4 as the backend storage. See [Troubleshooting Dassie](#troubleshooting-dassie) if you encounter any issues.
- [Koppie](#koppie-internal-test-app-with-valkyrie-connector-to-postgres) is a newer internal test app that is a Valkyrie-based Hyrax web application that runs with PostGres as backend storage. It does not run ActiveFedora or use Fedora 4. See [Troubleshooting Koppie](#troubleshooting-koppie) if you encounter any issues.

<!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
## Hyrax Engine Development
## Hyrax Engine Development

We support a `docker-compose`-based development environment for folks working on
the Hyrax engine. This environment is substantially more like a Hyrax production
Expand Down Expand Up @@ -191,7 +191,7 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
the [Samvera organization][samvera-packages]. To build them:

```sh
export HYRAX_VERSION=v4.0.0.rc1 # or desired version
export HYRAX_VERSION=v4.0.0.rc2 # or desired version
git checkout hyrax-$HYRAX_VERSION

docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
Expand Down Expand Up @@ -229,4 +229,4 @@ helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
```

[ghcr]: https://docs.github.com/en/enterprise-cloud@latest/packages/working-with-a-github-packages-registry/working-with-the-container-registry
[samvera-packages]: https://github.com/orgs/samvera/packages
[samvera-packages]: https://github.com/orgs/samvera/packages
6 changes: 3 additions & 3 deletions documentation/legacyREADME.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The Samvera community is here to help. Please see our [support guide](../.github
# Getting started

This document contains instructions specific to setting up an app with __Hyrax
v4.0.0.rc1__. If you are looking for instructions on installing a different
v4.0.0.rc2__. If you are looking for instructions on installing a different
version, be sure to select the appropriate branch or tag from the drop-down
menu above.

Expand Down Expand Up @@ -129,7 +129,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo

First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).

Hyrax supports Ruby 2.5, 2.6, and 2.7. When starting a new project, we recommend using the latest Ruby 2.7 version.
Hyrax supports Ruby 2.7, 3.0, 3.1 and 3.2. When starting a new project, we recommend using the latest Ruby 3.2 version.

## Redis

Expand Down Expand Up @@ -159,7 +159,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
Generate a new Rails application using the template.

```
rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc1/template.rb
rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc2/template.rb
```

Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
Expand Down
2 changes: 1 addition & 1 deletion lib/hyrax/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Hyrax
VERSION = '4.0.0.rc1'
VERSION = '4.0.0.rc2'
end
2 changes: 1 addition & 1 deletion template.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true
# Hack for https://github.com/rails/rails/issues/35153
gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
gem 'hyrax', '4.0.0.rc1'
gem 'hyrax', '4.0.0.rc2'
run 'bundle install'
generate 'hyrax:install', '-f'

0 comments on commit e5e446b

Please sign in to comment.