Skip to content

Commit a178ea8

Browse files
ja573ja573
committed
Merge branch 'release/v0.12.6'
2 parents eea2282 + e951738 commit a178ea8

17 files changed

Lines changed: 108 additions & 36 deletions

File tree

‎.github/workflows/build_test_and_check.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,45 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- uses: actions/checkout@v4
36+
- uses: actions/cache@v4
37+
with:
38+
path: |
39+
~/.cargo/bin/
40+
~/.cargo/registry/index/
41+
~/.cargo/registry/cache/
42+
~/.cargo/git/db/
43+
target/
44+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
3645
- name: Build binary
3746
run: cargo build -vv
3847
test:
3948
runs-on: ubuntu-latest
4049
steps:
4150
- uses: actions/checkout@v4
51+
- uses: actions/cache@v4
52+
with:
53+
path: |
54+
~/.cargo/bin/
55+
~/.cargo/registry/index/
56+
~/.cargo/registry/cache/
57+
~/.cargo/git/db/
58+
target/
59+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4260
- name: Run tests
4361
run: cargo test --workspace -vv
4462
lint:
4563
runs-on: ubuntu-latest
4664
steps:
4765
- uses: actions/checkout@v4
66+
- uses: actions/cache@v4
67+
with:
68+
path: |
69+
~/.cargo/bin/
70+
~/.cargo/registry/index/
71+
~/.cargo/registry/cache/
72+
~/.cargo/git/db/
73+
target/
74+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4875
- name: Run linting
4976
run: cargo clippy --all --all-targets --all-features -- -D warnings
5077
format_check:

‎.github/workflows/run_migrations.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ jobs:
4141
- 5432:5432
4242
steps:
4343
- uses: actions/checkout@v4
44+
- uses: actions/cache@v4
45+
with:
46+
path: |
47+
~/.cargo/bin/
48+
~/.cargo/registry/index/
49+
~/.cargo/registry/cache/
50+
~/.cargo/git/db/
51+
target/
52+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4453
- name: Build binary
4554
run: cargo build -vv
4655
- name: Run migrations

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
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.12.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.6) - 2024-06-17
10+
### Fixed
11+
- [#513](https://github.com/thoth-pub/thoth/issues/513) - Expand DOI regex to include `+`, `[`, and `]`
12+
13+
### Changed
14+
- [607](https://github.com/thoth-pub/thoth/pull/607) - Upgrade rust to `1.79.0` in production and development `Dockerfile`
15+
16+
### Added
17+
- [607](https://github.com/thoth-pub/thoth/pull/607) - Add caching steps to Github actions
18+
919
## [[0.12.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.5) - 2024-05-07
1020
### Changed
1121
- [601](https://github.com/thoth-pub/thoth/pull/601) - Upgrade rust to `1.78.0` in production and development `Dockerfile`

‎Cargo.lock‎

Lines changed: 8 additions & 8 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.12.5"
3+
version = "0.12.6"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
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.12.5", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "=0.12.5", path = "thoth-api-server" }
21-
thoth-app-server = { version = "=0.12.5", path = "thoth-app-server" }
22-
thoth-errors = { version = "=0.12.5", path = "thoth-errors" }
23-
thoth-export-server = { version = "=0.12.5", path = "thoth-export-server" }
19+
thoth-api = { version = "=0.12.6", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "=0.12.6", path = "thoth-api-server" }
21+
thoth-app-server = { version = "=0.12.6", path = "thoth-app-server" }
22+
thoth-errors = { version = "=0.12.6", path = "thoth-errors" }
23+
thoth-export-server = { version = "=0.12.6", 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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG MUSL_IMAGE=clux/muslrust:1.78.0-stable
1+
ARG MUSL_IMAGE=clux/muslrust:1.79.0-stable
22

33
FROM ${MUSL_IMAGE} as build
44

‎Dockerfile.dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG RUST_VERSION=1.78.0
1+
ARG RUST_VERSION=1.79.0
22

33
FROM rust:${RUST_VERSION}
44

‎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.12.5"
3+
version = "0.12.6"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
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.12.5", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "=0.12.5", path = "../thoth-errors" }
12+
thoth-api = { version = "=0.12.6", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "=0.12.6", path = "../thoth-errors" }
1414
actix-web = "4.5.1"
1515
actix-cors = "0.7.0"
1616
actix-identity = "0.7.1"

‎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.12.5"
3+
version = "0.12.6"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
1616
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken"]
1717

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

‎thoth-api/migrations/v0.12.6/down.sql‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ALTER TABLE work DROP CONSTRAINT work_doi_check;
2+
ALTER TABLE work ADD CONSTRAINT work_doi_check
3+
CHECK (doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$');
4+
5+
ALTER TABLE reference DROP CONSTRAINT reference_doi_check;
6+
ALTER TABLE reference ADD CONSTRAINT reference_doi_check
7+
CHECK (doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$');
8+
9+
ALTER TABLE institution DROP CONSTRAINT institution_institution_doi_check;
10+
ALTER TABLE institution ADD CONSTRAINT institution_institution_doi_check
11+
CHECK (institution_doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$');

0 commit comments

Comments
 (0)