Skip to content

Commit

Permalink
made it handle database versions with hotfix endings if exists e.g. W…
Browse files Browse the repository at this point in the history
…S277.1 vs WS277
  • Loading branch information
adamjohnwright committed Jul 15, 2020
1 parent 525b1d5 commit 596406d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .ebextensions/.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
option_settings:
- option_name: WB_DB_URI
value: datomic:ddb://us-east-1/WS277/wormbase
value: datomic:ddb://us-east-1/WS277.1/wormbase
- option_name: _JAVA_OPTIONS
value: "-Xmx14g"
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.3.2] - 2020-07-14
- Minor changes for releasing data hotfix WS277.1

## [1.3.1] - 2020-06-26
- Initial WS277 release

Expand Down
2 changes: 1 addition & 1 deletion Dockerrun.aws.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"AWSEBDockerrunVersion": 1,
"Image": {
"Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:1.3.1",
"Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:1.3.2",
"Update": "true"
},
"Ports": [
Expand Down
2 changes: 1 addition & 1 deletion jenkins-ci-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ docker rm wormbase-rest
make build-latest
make clean

export WB_DB_URI="datomic:ddb://us-east-1/WS277/wormbase"
export WB_DB_URI="datomic:ddb://us-east-1/WS277.1/wormbase"
make run-latest
9 changes: 8 additions & 1 deletion src/rest_api/db/sequence.clj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
[rest-api.db.sequencesql :as sequencesql]))

(defn database-version []
(pace-utils/wbdb-name (db/datomic-uri)))
(first
(str/split
(second
(reverse
(str/split
(db/datomic-uri)
#"/")))
#"\.")))

(def species-assemblies
(->> "ASSEMBLIES.json"
Expand Down

0 comments on commit 596406d

Please sign in to comment.