Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/deadpool-diesel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,22 @@ env:
jobs:
check-integration:
name: Check integration
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
- if: runner.os == 'Windows' && matrix.feature == 'mysql'
name: Install mysql (Windows)
run: |-
echo "MYSQLCLIENT_LIB_DIR=C:\Program Files\MySQL\MySQL Server 8.0\lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=8.0.40" >> $GITHUB_ENV
echo "C:\Program Files\MySQL\MySQL Server 8.0\lib" >> $GITHUB_PATH
echo "C:\Program Files\MySQL\MySQL Server 8.0\bin" >> $GITHUB_PATH
dir "C:\Program Files\MySQL\MySQL Server 8.0\lib"
shell: bash
- run: cargo check --features ${{ matrix.feature }}
strategy:
fail-fast: false
Expand All @@ -25,6 +34,9 @@ jobs:
- mysql
- postgres
- sqlite
os:
- ubuntu-latest
- windows-2025
check-reexported-features:
name: Check re-exported features
runs-on: ubuntu-latest
Expand Down Expand Up @@ -104,10 +116,12 @@ name: deadpool-diesel
- main
paths:
- crates/deadpool-diesel/**
- .github/workflows/deadpool-diesel.yml
push:
branches:
- main
paths:
- crates/deadpool-diesel/**
- .github/workflows/deadpool-diesel.yml
tags:
- deadpool-diesel-v*
7 changes: 6 additions & 1 deletion .github/workflows/deadpool-lapin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
jobs:
check-integration:
name: Check integration
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
Expand All @@ -21,6 +21,9 @@ jobs:
- serde
- rt_async-std_1
- rt_tokio_1
os:
- ubuntu-latest
- windows-2025
check-reexported-features:
name: Check re-exported features
runs-on: ubuntu-latest
Expand Down Expand Up @@ -109,10 +112,12 @@ name: deadpool-lapin
- main
paths:
- crates/deadpool-lapin/**
- .github/workflows/deadpool-lapin.yml
push:
branches:
- main
paths:
- crates/deadpool-lapin/**
- .github/workflows/deadpool-lapin.yml
tags:
- deadpool-lapin-v*
7 changes: 6 additions & 1 deletion .github/workflows/deadpool-libsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
jobs:
check-integration:
name: Check integration
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
Expand All @@ -23,6 +23,9 @@ jobs:
- remote
- replication
- sync
os:
- ubuntu-latest
- windows-2025
check-reexported-features:
name: Check re-exported features
runs-on: ubuntu-latest
Expand Down Expand Up @@ -102,10 +105,12 @@ name: deadpool-libsql
- main
paths:
- crates/deadpool-libsql/**
- .github/workflows/deadpool-libsql.yml
push:
branches:
- main
paths:
- crates/deadpool-libsql/**
- .github/workflows/deadpool-libsql.yml
tags:
- deadpool-libsql-v*
2 changes: 2 additions & 0 deletions .github/workflows/deadpool-memcached.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ name: deadpool-memcached
- main
paths:
- crates/deadpool-memcached/**
- .github/workflows/deadpool-memcached.yml
push:
branches:
- main
paths:
- crates/deadpool-memcached/**
- .github/workflows/deadpool-memcached.yml
tags:
- deadpool-memcached-v*
7 changes: 6 additions & 1 deletion .github/workflows/deadpool-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
jobs:
check-integration:
name: Check integration
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
Expand All @@ -21,6 +21,9 @@ jobs:
- serde
- rt_tokio_1
- rt_async-std_1
os:
- ubuntu-latest
- windows-2025
check-integration-wasm:
name: Check integration (WebAssembly)
runs-on: ubuntu-latest
Expand Down Expand Up @@ -131,10 +134,12 @@ name: deadpool-postgres
- main
paths:
- crates/deadpool-postgres/**
- .github/workflows/deadpool-postgres.yml
push:
branches:
- main
paths:
- crates/deadpool-postgres/**
- .github/workflows/deadpool-postgres.yml
tags:
- deadpool-postgres-v*
23 changes: 23 additions & 0 deletions .github/workflows/deadpool-r2d2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,27 @@ defaults:
env:
RUST_BACKTRACE: 1
jobs:
check-integration:
name: Check integration
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
- run: cargo check --features ${{ matrix.feature }}
strategy:
fail-fast: false
matrix:
feature:
- rt_async-std_1
- rt_tokio_1
- serde
- tracing
os:
- ubuntu-latest
- windows-2025
check-reexported-features:
name: Check re-exported features
runs-on: ubuntu-latest
Expand Down Expand Up @@ -97,10 +118,12 @@ name: deadpool-r2d2
- main
paths:
- crates/deadpool-r2d2/**
- .github/workflows/deadpool-r2d2.yml
push:
branches:
- main
paths:
- crates/deadpool-r2d2/**
- .github/workflows/deadpool-r2d2.yml
tags:
- deadpool-r2d2-v*
7 changes: 6 additions & 1 deletion .github/workflows/deadpool-redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
jobs:
check-integration:
name: Check integration
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
Expand All @@ -23,6 +23,9 @@ jobs:
- rt_async-std_1
- cluster
- sentinel
os:
- ubuntu-latest
- windows-2025
check-reexported-features:
name: Check re-exported features
runs-on: ubuntu-latest
Expand Down Expand Up @@ -121,10 +124,12 @@ name: deadpool-redis
- main
paths:
- crates/deadpool-redis/**
- .github/workflows/deadpool-redis.yml
push:
branches:
- main
paths:
- crates/deadpool-redis/**
- .github/workflows/deadpool-redis.yml
tags:
- deadpool-redis-v*
2 changes: 2 additions & 0 deletions .github/workflows/deadpool-runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ name: deadpool-runtime
- main
paths:
- crates/deadpool-runtime/**
- .github/workflows/deadpool-runtime.yml
push:
branches:
- main
paths:
- crates/deadpool-runtime/**
- .github/workflows/deadpool-runtime.yml
tags:
- deadpool-runtime-v*
7 changes: 6 additions & 1 deletion .github/workflows/deadpool-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
jobs:
check-integration:
name: Check integration
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
Expand All @@ -22,6 +22,9 @@ jobs:
- tracing
- rt_tokio_1
- rt_async-std_1
os:
- ubuntu-latest
- windows-2025
check-reexported-features:
name: Check re-exported features
runs-on: ubuntu-latest
Expand Down Expand Up @@ -101,10 +104,12 @@ name: deadpool-sqlite
- main
paths:
- crates/deadpool-sqlite/**
- .github/workflows/deadpool-sqlite.yml
push:
branches:
- main
paths:
- crates/deadpool-sqlite/**
- .github/workflows/deadpool-sqlite.yml
tags:
- deadpool-sqlite-v*
2 changes: 2 additions & 0 deletions .github/workflows/deadpool-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ name: deadpool-sync
- main
paths:
- crates/deadpool-sync/**
- .github/workflows/deadpool-sync.yml
push:
branches:
- main
paths:
- crates/deadpool-sync/**
- .github/workflows/deadpool-sync.yml
tags:
- deadpool-sync-v*
2 changes: 2 additions & 0 deletions .github/workflows/deadpool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,12 @@ name: deadpool
- main
paths:
- crates/deadpool/**
- .github/workflows/deadpool.yml
push:
branches:
- main
paths:
- crates/deadpool/**
- .github/workflows/deadpool.yml
tags:
- deadpool-v*
11 changes: 7 additions & 4 deletions ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ local features =
else
null;
local check_features = getConfig("check.features", features);
local check_extra_steps = getConfig("check.extra_steps", []);
local test_features = getConfig("test.features", features);
local test_services = getConfig("test.services", {});
local test_env = getConfig("test.env", {});
Expand All @@ -45,11 +46,11 @@ local genFeaturesFlag(features) =
push: {
branches: [ "main" ],
tags: [ std.format("%s-v*", crate) ],
paths: [ std.format("crates/%s/**", crate) ]
paths: [ std.format("crates/%s/**", crate), std.format(".github/workflows/%s.yml", crate) ]
},
pull_request: {
branches: [ "main" ],
paths: [ std.format("crates/%s/**", crate) ]
paths: [ std.format("crates/%s/**", crate), std.format(".github/workflows/%s.yml", crate) ]
}
},
env: {
Expand Down Expand Up @@ -112,15 +113,16 @@ local genFeaturesFlag(features) =
###########

# FIXME The check integration job should be enabled for all crates with a backend
[if std.member(["deadpool-diesel", "deadpool-lapin", "deadpool-postgres", "deadpool-redis", "deadpool-sqlite", "deadpool-libsql"], crate) then "check-integration"]: {
[if check_features != null then "check-integration"]: {
name: "Check integration",
strategy: {
"fail-fast": false,
matrix: {
feature: check_features,
os: ["ubuntu-latest", "windows-2025"],
}
},
"runs-on": "ubuntu-latest",
"runs-on": "${{ matrix.os }}",
steps: [
{ uses: "actions/checkout@v3" },
{
Expand All @@ -130,6 +132,7 @@ local genFeaturesFlag(features) =
toolchain: "stable",
}
},
] + check_extra_steps + [
# We don't use `--no-default-features` here as integration crates don't
# work with it at all.
{
Expand Down
12 changes: 12 additions & 0 deletions crates/deadpool-diesel/ci.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,15 @@ test:
- tracing
- rt_tokio_1
- sqlite

check:
extra_steps:
- name: Install mysql (Windows)
if: runner.os == 'Windows' && matrix.feature == 'mysql'
shell: bash
run: |
echo "MYSQLCLIENT_LIB_DIR=C:\Program Files\MySQL\MySQL Server 8.0\lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=8.0.40" >> $GITHUB_ENV
echo "C:\Program Files\MySQL\MySQL Server 8.0\lib" >> $GITHUB_PATH
echo "C:\Program Files\MySQL\MySQL Server 8.0\bin" >> $GITHUB_PATH
dir "C:\Program Files\MySQL\MySQL Server 8.0\lib"
Loading