Skip to content

Commit 70f5a41

Browse files
ja573ja573
committed
Merge branch 'release/v0.8.8'
2 parents f557c5e + 8ce73f8 commit 70f5a41

49 files changed

Lines changed: 844 additions & 227 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_test_and_check.yml‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,31 @@ env:
1313
THOTH_EXPORT_API: https://export.thoth.pub
1414

1515
jobs:
16-
build_test_and_lint:
16+
build:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: actions/setup-node@v2
21+
with:
22+
node-version: '12.19.0'
23+
- uses: actions-rs/toolchain@v1
24+
with:
25+
toolchain: stable
26+
- uses: jetli/wasm-pack-action@v0.3.0
27+
with:
28+
version: 'v0.9.1'
29+
- name: Install rollup
30+
run: sudo npm install -g rollup@2.28.2
31+
- name: Compile WASM
32+
run: wasm-pack build thoth-app/ --target web --release
33+
- name: Pack APP
34+
run: rollup thoth-app/main.js --format iife --file thoth-app/pkg/thoth_app.js
35+
- name: Build binary
36+
uses: actions-rs/cargo@v1
37+
with:
38+
command: build
39+
args: --verbose
40+
test:
1741
runs-on: ubuntu-latest
1842
steps:
1943
- uses: actions/checkout@v2
@@ -42,6 +66,30 @@ jobs:
4266
with:
4367
command: test
4468
args: --workspace --verbose
69+
lint:
70+
runs-on: ubuntu-latest
71+
steps:
72+
- uses: actions/checkout@v2
73+
- uses: actions/setup-node@v2
74+
with:
75+
node-version: '12.19.0'
76+
- uses: actions-rs/toolchain@v1
77+
with:
78+
toolchain: stable
79+
- uses: jetli/wasm-pack-action@v0.3.0
80+
with:
81+
version: 'v0.9.1'
82+
- name: Install rollup
83+
run: sudo npm install -g rollup@2.28.2
84+
- name: Compile WASM
85+
run: wasm-pack build thoth-app/ --target web --release
86+
- name: Pack APP
87+
run: rollup thoth-app/main.js --format iife --file thoth-app/pkg/thoth_app.js
88+
- name: Build binary
89+
uses: actions-rs/cargo@v1
90+
with:
91+
command: build
92+
args: --verbose
4593
- name: Run linting
4694
uses: actions-rs/cargo@v1
4795
with:

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [[0.8.8]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.8) - 2022-08-02
10+
### Added
11+
- [#389](https://github.com/thoth-pub/thoth/issues/389) - Streamline chapter (child work) creation process
12+
13+
### Changed
14+
- [#411](https://github.com/thoth-pub/thoth/issues/411) - Make `copyright_holder` optional
15+
- [#393](https://github.com/thoth-pub/thoth/issues/393) - Use en-dash in `page_interval` instead of hyphen
16+
- Ignore `extra_unused_lifetimes` warning until [clippy's fix](https://github.com/rust-lang/rust-clippy/issues/9014) for the false positive is live
17+
- Split build, test, and lint workflow job into separate jobs
18+
919
## [[0.8.7]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.7) - 2022-07-22
1020
### Fixed
1121
- [#379](https://github.com/thoth-pub/thoth/issues/379) - Limit to 6 the number of ISBNs offered in CrossRef metadata export
@@ -14,7 +24,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1424
### Changed
1525
- [#370](https://github.com/thoth-pub/thoth/issues/370) - Upgrade Yew to v0.19
1626

17-
1827
## [[0.8.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.6) - 2022-07-01
1928
### Added
2029
- [#390](https://github.com/thoth-pub/thoth/pull/390) - Implement OverDrive ONIX 3.0 specification

‎Cargo.lock‎

Lines changed: 26 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.8.7"
3+
version = "0.8.8"
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.8.7", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.8.7", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.8.7", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.8.7", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.8.7", path = "thoth-export-server" }
19+
thoth-api = { version = "0.8.8", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.8.8", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.8.8", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.8.8", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.8.8", path = "thoth-export-server" }
2424
clap = "2.33.3"
2525
dialoguer = "0.7.1"
2626
dotenv = "0.15.0"

‎thoth-api-server/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.8.7"
3+
version = "0.8.8"
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.8.7", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.8.7", path = "../thoth-errors" }
12+
thoth-api = { version = "0.8.8", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.8.8", path = "../thoth-errors" }
1414
actix-web = "4.0.1"
1515
actix-cors = "0.6.0"
1616
actix-identity = "0.4.0"

‎thoth-api/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.8.7"
3+
version = "0.8.8"
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.8.7", path = "../thoth-errors" }
19+
thoth-errors = { version = "0.8.8", path = "../thoth-errors" }
2020
actix-web = { version = "4.0.1", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"

‎thoth-api/migrations/0.8.8/down.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALTER TABLE work
2+
ALTER COLUMN copyright_holder SET NOT NULL;
3+
4+
UPDATE work SET page_interval = REPLACE(page_interval, '–', '-');

‎thoth-api/migrations/0.8.8/up.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALTER TABLE work
2+
ALTER COLUMN copyright_holder DROP NOT NULL;
3+
4+
UPDATE work SET page_interval = REPLACE(page_interval, '-', '–');

‎thoth-api/src/graphql/model.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2057,8 +2057,8 @@ impl Work {
20572057
self.license.as_ref()
20582058
}
20592059

2060-
pub fn copyright_holder(&self) -> &str {
2061-
self.copyright_holder.as_str()
2060+
pub fn copyright_holder(&self) -> Option<&String> {
2061+
self.copyright_holder.as_ref()
20622062
}
20632063

20642064
pub fn landing_page(&self) -> Option<&String> {

‎thoth-api/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::extra_unused_lifetimes)]
2+
13
#[cfg(feature = "backend")]
24
#[macro_use]
35
extern crate diesel;

0 commit comments

Comments
 (0)