Merge branch 'release/v0.9.5'

thoth-pub · Jan 17, 2023 · b600684 · b600684
2 parents cd7a8ea + 24a88a5
commit b600684
Show file tree

Hide file tree

Showing 14 changed files with 756 additions and 339 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.9.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.9.5) - 2023-01-17
+### Changed
+  - Upgrade rust to `1.66.0` in production and development `Dockerfile`
+  - Upgrade build dependencies (npm `v9.2.0`, n `v9.0.1`, node `v18.12.1` and rollup `v3.7.4`) in production and development `Dockerfile`
+
+### Fixed
+  - [#463](https://github.com/thoth-pub/thoth/issues/463) - Update Thema codes to v1.5
+
 ## [[0.9.4]](https://github.com/thoth-pub/thoth/releases/tag/v0.9.4) - 2022-12-05
 ### Added
   - [#414](https://github.com/thoth-pub/thoth/pull/414) - Synchronise chapters' `work_status` and `publication_date` with parent's upon parent's update

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.9.4"
+version = "0.9.5"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "0.9.4", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.9.4", path = "thoth-api-server" }
-thoth-app-server = { version = "0.9.4", path = "thoth-app-server" }
-thoth-errors = { version = "0.9.4", path = "thoth-errors" }
-thoth-export-server = { version = "0.9.4", path = "thoth-export-server" }
+thoth-api = { version = "0.9.5", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.9.5", path = "thoth-api-server" }
+thoth-app-server = { version = "0.9.5", path = "thoth-app-server" }
+thoth-errors = { version = "0.9.5", path = "thoth-errors" }
+thoth-export-server = { version = "0.9.5", path = "thoth-export-server" }
 clap = "2.33.3"
 dialoguer = "0.7.1"
 dotenv = "0.15.0"

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-ARG RUST_IMAGE=rust:1.65.0
-ARG MUSL_IMAGE=clux/muslrust:1.65.0-stable
+ARG RUST_IMAGE=rust:1.66.0
+ARG MUSL_IMAGE=clux/muslrust:1.66.0
 
 FROM ${RUST_IMAGE} as wasm
 
-ENV NPM_VERSION=8.15.1
-ENV N_VERSION=9.0.0
-ENV NODE_VERSION=16.16.0
-ENV ROLLUP_VERSION=2.77.2
+ENV NPM_VERSION=9.2.0
+ENV N_VERSION=9.0.1
+ENV NODE_VERSION=18.12.1
+ENV ROLLUP_VERSION=3.7.4
 ENV WASM_PACK_VERSION=0.10.3
 
 ARG THOTH_GRAPHQL_API=https://api.thoth.pub
@@ -18,9 +18,9 @@ WORKDIR /wasm
 
 # Install build dependencies
 RUN apt-get update && apt-get -y install pkg-config npm
-RUN npm install -g npm@${NPM_VERSION}
 RUN npm install -g n@${N_VERSION}
 RUN n ${NODE_VERSION}
+RUN npm install -g npm@${NPM_VERSION}
 RUN npm install -g rollup@${ROLLUP_VERSION}
 RUN cargo install wasm-pack --version ${WASM_PACK_VERSION}
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,11 +1,11 @@
-ARG RUST_VERSION=1.65.0
+ARG RUST_VERSION=1.66.0
 
 FROM rust:${RUST_VERSION}
 
-ENV NPM_VERSION=8.15.1
-ENV N_VERSION=9.0.0
-ENV NODE_VERSION=16.16.0
-ENV ROLLUP_VERSION=2.77.2
+ENV NPM_VERSION=9.2.0
+ENV N_VERSION=9.0.1
+ENV NODE_VERSION=18.12.1
+ENV ROLLUP_VERSION=3.7.4
 ENV WASM_PACK_VERSION=0.10.3
 
 ARG THOTH_GRAPHQL_API=http://localhost:8000
@@ -22,9 +22,9 @@ EXPOSE 8181
 
 # Install build dependencies
 RUN apt-get update && apt-get -y install pkg-config npm
-RUN npm install -g npm@${NPM_VERSION}
 RUN npm install -g n@${N_VERSION}
 RUN n ${NODE_VERSION}
+RUN npm install -g npm@${NPM_VERSION}
 RUN npm install -g rollup@${ROLLUP_VERSION}
 RUN cargo install wasm-pack --version ${WASM_PACK_VERSION}
 

diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.9.4"
+version = "0.9.5"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.9.4", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.9.4", path = "../thoth-errors" }
+thoth-api = { version = "0.9.5", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.9.5", path = "../thoth-errors" }
 actix-web = "4.0.1"
 actix-cors = "0.6.0"
 actix-identity = "0.4.0"

diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.9.4"
+version = "0.9.5"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
 
 [dependencies]
-thoth-errors = { version = "0.9.4", path = "../thoth-errors" }
+thoth-errors = { version = "0.9.5", path = "../thoth-errors" }
 actix-web = { version = "4.0.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"