mirror of
https://github.com/LukeMathWalker/zero-to-production.git
synced 2024-11-27 03:21:08 +00:00
Update dependencies
This commit is contained in:
parent
2e74ab3df1
commit
c6921090b2
5 changed files with 938 additions and 618 deletions
53
.github/workflows/general.yml
vendored
53
.github/workflows/general.yml
vendored
|
@ -8,13 +8,13 @@ on:
|
|||
branches:
|
||||
- root-chapter-06-part0
|
||||
pull_request:
|
||||
types: [ opened, synchronize, reopened ]
|
||||
types: [opened, synchronize, reopened]
|
||||
branches:
|
||||
- root-chapter-06-part0
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
SQLX_VERSION: 0.7.1
|
||||
SQLX_VERSION: 0.8.0
|
||||
SQLX_FEATURES: "rustls,postgres"
|
||||
|
||||
jobs:
|
||||
|
@ -23,6 +23,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
services:
|
||||
postgres:
|
||||
# Docker Hub image
|
||||
image: postgres:14
|
||||
env:
|
||||
POSTGRES_USER: postgres
|
||||
|
@ -31,18 +32,34 @@ jobs:
|
|||
ports:
|
||||
- 5432:5432
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: dtolnay/rust-toolchain@stable
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
# Downloads a copy of the code in your repository before running CI tests
|
||||
- name: Check out repository code
|
||||
# The uses keyword specifies that this step will run v3 of the actions/checkout action.
|
||||
# This is an action that checks out your repository onto the runner, allowing you to run scripts or other actions against your code (such as build and test tools).
|
||||
# You should use the checkout action any time your workflow will run against the repository's code.
|
||||
uses: actions/checkout@v3
|
||||
|
||||
# This GitHub Action installs a Rust toolchain using rustup. It is designed for one-line concise usage and good defaults.
|
||||
- name: Install the Rust toolchain
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
|
||||
# A GitHub Action that implements smart caching for rust/cargo projects with sensible defaults.
|
||||
- name: Rust Cache Action
|
||||
uses: Swatinem/rust-cache@v2
|
||||
with:
|
||||
key: sqlx-${{ env.SQLX_VERSION }}
|
||||
- name: Install sqlx-cli
|
||||
run:
|
||||
cargo install sqlx-cli
|
||||
--version=${{ env.SQLX_VERSION }}
|
||||
--features ${{ env.SQLX_FEATURES }}
|
||||
--no-default-features
|
||||
--locked
|
||||
cargo install sqlx-cli
|
||||
--version=${{ env.SQLX_VERSION }}
|
||||
--features ${{ env.SQLX_FEATURES }}
|
||||
--no-default-features
|
||||
--locked
|
||||
# The --locked flag can be used to force Cargo to use the packaged Cargo.lock file if it is available.
|
||||
# This may be useful for ensuring reproducible builds, to use the exact same set of dependencies that were available when the package was published.
|
||||
# It may also be useful if a newer version of a dependency is published that no longer builds on your system, or has other problems
|
||||
- name: Install postgresql-client
|
||||
run: sudo apt-get update && sudo apt-get install postgresql-client -y
|
||||
- name: Migrate database
|
||||
run: |
|
||||
sudo apt-get install libpq-dev -y
|
||||
|
@ -85,12 +102,13 @@ jobs:
|
|||
with:
|
||||
key: sqlx-${{ env.SQLX_VERSION }}
|
||||
- name: Install sqlx-cli
|
||||
run:
|
||||
cargo install sqlx-cli
|
||||
--version=${{ env.SQLX_VERSION }}
|
||||
--features ${{ env.SQLX_FEATURES }}
|
||||
--no-default-features
|
||||
--locked
|
||||
run: cargo install sqlx-cli
|
||||
--version=${{ env.SQLX_VERSION }}
|
||||
--features ${{ env.SQLX_FEATURES }}
|
||||
--no-default-features
|
||||
--locked
|
||||
- name: Install postgresql-client
|
||||
run: sudo apt-get update && sudo apt-get install postgresql-client -y
|
||||
- name: Migrate database
|
||||
run: |
|
||||
sudo apt-get install libpq-dev -y
|
||||
|
@ -122,8 +140,7 @@ jobs:
|
|||
- name: Install tarpaulin
|
||||
run: cargo install cargo-tarpaulin
|
||||
- name: Install sqlx-cli
|
||||
run:
|
||||
cargo install sqlx-cli
|
||||
run: cargo install sqlx-cli
|
||||
--version=${{ env.SQLX_VERSION }}
|
||||
--features ${{ env.SQLX_FEATURES }}
|
||||
--no-default-features
|
||||
|
|
1484
Cargo.lock
generated
1484
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
15
Cargo.toml
15
Cargo.toml
|
@ -16,21 +16,28 @@ name = "zero2prod"
|
|||
actix-web = "4"
|
||||
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
|
||||
serde = "1.0.115"
|
||||
config = { version = "0.13", default-features = false, features = ["yaml"] }
|
||||
sqlx = { version = "0.7", default-features = false, features = ["runtime-tokio-rustls", "macros", "postgres", "uuid", "chrono", "migrate"] }
|
||||
config = { version = "0.14", default-features = false, features = ["yaml"] }
|
||||
sqlx = { version = "0.8", default-features = false, features = [
|
||||
"runtime-tokio-rustls",
|
||||
"macros",
|
||||
"postgres",
|
||||
"uuid",
|
||||
"chrono",
|
||||
"migrate",
|
||||
] }
|
||||
uuid = { version = "1", features = ["v4"] }
|
||||
chrono = { version = "0.4.22", default-features = false, features = ["clock"] }
|
||||
log = "0.4"
|
||||
tracing = "0.1.19"
|
||||
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
|
||||
tracing-bunyan-formatter = "0.3.1"
|
||||
tracing-log = "0.1.1"
|
||||
serde-aux = "4"
|
||||
unicode-segmentation = "1.7.1"
|
||||
tracing-log = "0.2.0"
|
||||
tracing-actix-web = "0.7"
|
||||
secrecy = { version = "0.8", features = ["serde"] }
|
||||
|
||||
[dev-dependencies]
|
||||
reqwest = { version = "0.11", features = ["json"] }
|
||||
claims = "0.7"
|
||||
reqwest = { version = "0.12", features = ["json"] }
|
||||
once_cell = "1.7.2"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM lukemathwalker/cargo-chef:latest-rust-1.72.0 as chef
|
||||
FROM lukemathwalker/cargo-chef:latest-rust-1.80.1 as chef
|
||||
WORKDIR /app
|
||||
RUN apt update && apt install lld clang -y
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ fi
|
|||
if ! [ -x "$(command -v sqlx)" ]; then
|
||||
echo >&2 "Error: sqlx is not installed."
|
||||
echo >&2 "Use:"
|
||||
echo >&2 " cargo install --version='~0.7' sqlx-cli --no-default-features --features rustls,postgres"
|
||||
echo >&2 " cargo install --version='~0.8' sqlx-cli --no-default-features --features rustls,postgres"
|
||||
echo >&2 "to install it."
|
||||
exit 1
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue