Skip to content

Commit a4455db

Browse files
ja573ja573
committed
Merge branch 'release/v0.11.11'
2 parents a469c73 + 324e1f4 commit a4455db

File tree

15 files changed

+54
-49
lines changed

15 files changed

+54
-49
lines changed

‎.github/workflows/build_test_and_check.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ jobs:
3535
- uses: actions/checkout@v3
3636
- uses: actions/setup-node@v3
3737
with:
38-
node-version: '18.18.2'
38+
node-version: '20.10.0'
3939
- uses: actions-rs/toolchain@v1
4040
with:
4141
toolchain: stable
4242
- uses: jetli/wasm-pack-action@v0.3.0
4343
with:
4444
version: 'v0.12.1'
4545
- name: Install rollup
46-
run: sudo npm install -g rollup@4.1.4
46+
run: sudo npm install -g rollup@4.9.1
4747
- name: Compile WASM
4848
run: wasm-pack build thoth-app/ --target web --release
4949
- name: Pack APP
@@ -59,15 +59,15 @@ jobs:
5959
- uses: actions/checkout@v3
6060
- uses: actions/setup-node@v3
6161
with:
62-
node-version: '18.18.2'
62+
node-version: '20.10.0'
6363
- uses: actions-rs/toolchain@v1
6464
with:
6565
toolchain: stable
6666
- uses: jetli/wasm-pack-action@v0.3.0
6767
with:
6868
version: 'v0.12.1'
6969
- name: Install rollup
70-
run: sudo npm install -g rollup@4.1.4
70+
run: sudo npm install -g rollup@4.9.1
7171
- name: Compile WASM
7272
run: wasm-pack build thoth-app/ --target web --release
7373
- name: Pack APP
@@ -88,15 +88,15 @@ jobs:
8888
- uses: actions/checkout@v3
8989
- uses: actions/setup-node@v3
9090
with:
91-
node-version: '18.18.2'
91+
node-version: '20.10.0'
9292
- uses: actions-rs/toolchain@v1
9393
with:
9494
toolchain: stable
9595
- uses: jetli/wasm-pack-action@v0.3.0
9696
with:
9797
version: 'v0.12.1'
9898
- name: Install rollup
99-
run: sudo npm install -g rollup@4.1.4
99+
run: sudo npm install -g rollup@4.9.1
100100
- name: Compile WASM
101101
run: wasm-pack build thoth-app/ --target web --release
102102
- name: Pack APP

‎.github/workflows/run_migrations.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343
- uses: actions/checkout@v3
4444
- uses: actions/setup-node@v3
4545
with:
46-
node-version: '18.18.2'
46+
node-version: '20.10.0'
4747
- uses: actions-rs/toolchain@v1
4848
with:
4949
toolchain: stable
5050
- uses: jetli/wasm-pack-action@v0.3.0
5151
with:
5252
version: 'v0.12.1'
5353
- name: Install rollup
54-
run: sudo npm install -g rollup@4.1.4
54+
run: sudo npm install -g rollup@4.9.1
5555
- name: Compile WASM
5656
run: wasm-pack build thoth-app/ --target web --release
5757
- name: Pack APP

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [[0.11.11]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.11) - 2023-12-19
10+
### Changed
11+
- Upgrade rust to `1.74.1` in production and development `Dockerfile`
12+
- Upgrade build dependencies (npm `v10.2.5`, node `v20.10.0` and rollup `v4.9.1`) in production and development `Dockerfile`
13+
914
## [[0.11.10]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.10) - 2023-11-27
1015
### Fixed
1116
- [524](https://github.com/thoth-pub/thoth/pull/524) - Bibliography note not being retrieved on work page

‎Cargo.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
1616
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
1717

1818
[dependencies]
19-
thoth-api = { version = "0.11.10", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.11.10", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.11.10", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.11.10", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.11.10", path = "thoth-export-server" }
19+
thoth-api = { version = "0.11.11", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.11.11", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.11.11", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.11.11", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.11.11", path = "thoth-export-server" }
2424
clap = { version = "4.4.7", features = ["cargo", "env"] }
2525
dialoguer = { version = "0.11.0", features = ["password"] }
2626
dotenv = "0.15.0"

‎Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
ARG RUST_IMAGE=rust:1.74.0
2-
ARG MUSL_IMAGE=clux/muslrust:1.74.0
1+
ARG RUST_IMAGE=rust:1.74.1
2+
ARG MUSL_IMAGE=clux/muslrust:1.74.1
33

44
FROM ${RUST_IMAGE} as wasm
55

6-
ENV NPM_VERSION=10.2.0
6+
ENV NPM_VERSION=10.2.5
77
ENV N_VERSION=9.2.0
8-
ENV NODE_VERSION=18.18.2
9-
ENV ROLLUP_VERSION=4.1.4
8+
ENV NODE_VERSION=20.10.0
9+
ENV ROLLUP_VERSION=4.9.1
1010
ENV WASM_PACK_VERSION=0.12.1
1111

1212
ARG THOTH_GRAPHQL_API=https://api.thoth.pub

‎Dockerfile.dev

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ARG RUST_VERSION=1.74.0
1+
ARG RUST_VERSION=1.74.1
22

33
FROM rust:${RUST_VERSION}
44

5-
ENV NPM_VERSION=10.2.0
5+
ENV NPM_VERSION=10.2.5
66
ENV N_VERSION=9.2.0
7-
ENV NODE_VERSION=18.18.2
8-
ENV ROLLUP_VERSION=4.1.4
7+
ENV NODE_VERSION=20.10.0
8+
ENV ROLLUP_VERSION=4.9.1
99
ENV WASM_PACK_VERSION=0.12.1
1010

1111
ARG THOTH_GRAPHQL_API=http://localhost:8000

‎thoth-api-server/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.10", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.11.10", path = "../thoth-errors" }
12+
thoth-api = { version = "0.11.11", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
1414
actix-web = "4.4.0"
1515
actix-cors = "0.6.4"
1616
actix-identity = "0.6.0"

‎thoth-api/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
1616
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
1717

1818
[dependencies]
19-
thoth-errors = { version = "0.11.10", path = "../thoth-errors" }
19+
thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
2020
actix-web = { version = "4.4.0", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"

‎thoth-app-server/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app-server"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-app/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
4141
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
4242
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
4343
getrandom = { version = "0.2", features = ["js"] }
44-
thoth-api = { version = "0.11.10", path = "../thoth-api" }
45-
thoth-errors = { version = "0.11.10", path = "../thoth-errors" }
44+
thoth-api = { version = "0.11.11", path = "../thoth-api" }
45+
thoth-errors = { version = "0.11.11", path = "../thoth-errors" }

‎thoth-app/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start_url": "/?homescreen=1",
1010
"background_color": "#ffffff",
1111
"theme_color": "#ffdd57",
12-
"version": "0.11.10",
12+
"version": "0.11.11",
1313
"icons": [
1414
{
1515
"src": "\/android-icon-36x36.png",

‎thoth-client/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-client"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = {version = "0.11.10", path = "../thoth-api" }
13-
thoth-errors = {version = "0.11.10", path = "../thoth-errors" }
12+
thoth-api = {version = "0.11.11", path = "../thoth-api" }
13+
thoth-errors = {version = "0.11.11", path = "../thoth-errors" }
1414
graphql_client = "0.13.0"
1515
chrono = { version = "0.4.31", features = ["serde"] }
1616
reqwest = { version = "0.11", features = ["json"] }

‎thoth-errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-errors"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-export-server/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-export-server"
3-
version = "0.11.10"
3+
version = "0.11.11"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,9 +9,9 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.10", path = "../thoth-api" }
13-
thoth-errors = { version = "0.11.10", path = "../thoth-errors" }
14-
thoth-client = { version = "0.11.10", path = "../thoth-client" }
12+
thoth-api = { version = "0.11.11", path = "../thoth-api" }
13+
thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
14+
thoth-client = { version = "0.11.11", path = "../thoth-client" }
1515
actix-web = "4.4.0"
1616
actix-cors = "0.6.4"
1717
cc_license = "0.1.0"

0 commit comments

Comments
 (0)