Skip to content

Commit c17643c

Browse files
committed
test
1 parent bd0233b commit c17643c

File tree

4 files changed

+37
-6
lines changed

4 files changed

+37
-6
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
- js,derive
4545
- js,hmac-sha1
4646
include:
47+
- crate_name: oauth1-request
4748
- toolchain: stable
4849
components: clippy
4950
- toolchain: beta
@@ -53,6 +54,10 @@ jobs:
5354
- toolchain: stable
5455
features: js
5556
target: wasm32-unknown-unknown
57+
crate_name: oauth1-request
58+
- toolchain: '1.46.0'
59+
msrv: true
60+
crate_name: oauth1-request-test
5661
steps:
5762
- uses: actions/checkout@v2
5863
- name: Install Rust toolchain
@@ -77,37 +82,41 @@ jobs:
7782
tar -xzf "$NAME.tar.gz" "$NAME/wasm-bindgen-test-runner"
7883
mv "$NAME/wasm-bindgen-test-runner" /usr/local/bin/
7984
- run: echo "RUSTFLAGS=$RUSTFLAGS --allow unknown_lints" >> "$GITHUB_ENV"
80-
if: matrix.toolchain == '1.46.0'
85+
if: matrix.msrv
8186
- run: echo 'CARGO_BUILD_TARGET=${{ matrix.target }}' >> "$GITHUB_ENV"
8287
if: matrix.target != ''
88+
- run: rm Cargo.toml
89+
if: matrix.crate_name == 'oauth1-request-test'
8390
- name: Clippy `oauth1-request`
8491
if: contains(matrix.components, 'clippy')
8592
uses: actions-rs/cargo@v1
8693
with:
8794
command: clippy
88-
args: --verbose --tests --manifest-path oauth1-request/Cargo.toml --no-default-features '--features=${{ matrix.features }}'
95+
args: --verbose --tests --manifest-path ${{ matrix.crate_name }}/Cargo.toml --no-default-features '--features=${{ matrix.features }}'
8996
- name: Check docs of `oauth1-request`
9097
if: matrix.features == 'js,derive'
9198
uses: actions-rs/cargo@v1
9299
with:
93100
command: doc
94-
args: --verbose --manifest-path oauth1-request/Cargo.toml --no-default-features '--features=${{ matrix.features }}' --no-deps
101+
args: --verbose --manifest-path ${{ matrix.crate_name }}/Cargo.toml --no-default-features '--features=${{ matrix.features }}' --no-deps
95102
- name: Build `oauth1-request`
103+
if: matrix.crate_name != 'oauth1-request-test' || !contains(matrix.features, 'derive')
96104
uses: actions-rs/cargo@v1
97105
with:
98106
command: build
99-
args: --verbose --tests --manifest-path oauth1-request/Cargo.toml --no-default-features '--features=${{ matrix.features }}'
107+
args: --verbose --tests --manifest-path ${{ matrix.crate_name }}/Cargo.toml --no-default-features '--features=${{ matrix.features }}'
100108
- name: Build `examples`
101-
if: ${{ matrix.target == '' && matrix.toolchain != '1.46.0' }}
109+
if: ${{ matrix.target == '' && !matrix.msrv }}
102110
uses: actions-rs/cargo@v1
103111
with:
104112
command: build
105113
args: --verbose --manifest-path examples/Cargo.toml
106114
- name: Test `oauth1-request`
115+
if: ${{ matrix.target == '' && !matrix.msrv }}
107116
uses: actions-rs/cargo@v1
108117
with:
109118
command: test
110-
args: --manifest-path oauth1-request/Cargo.toml --no-default-features '--features=${{ matrix.features }}'
119+
args: --manifest-path ${{ matrix.crate_name }}/Cargo.toml --no-default-features '--features=${{ matrix.features }}'
111120
derive-test:
112121
name: Test `oauth1-request-derive`
113122
runs-on: ubuntu-latest

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ members = [
33
"oauth-credentials",
44
"oauth1-request",
55
"oauth1-request-derive",
6+
"oauth1-request-test",
67
]
78

89
[patch.crates-io]

oauth1-request-test/Cargo.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[package]
2+
name = "oauth1-request-test"
3+
version = "0.0.0"
4+
edition = "2018"
5+
authors = ["Daiki Mizukami <[email protected]>"]
6+
description = "A hack to make the CI work with older toolchains."
7+
publish = false
8+
9+
[dependencies]
10+
oauth1-request = { path = "../oauth1-request", default-features = false }
11+
12+
[features]
13+
default = ["hmac-sha1", "std"]
14+
alloc = ["oauth1-request/alloc"]
15+
hmac-sha1 = ["oauth1-request/hmac-sha1"]
16+
rsa-sha1-06 = ["oauth1-request/rsa-sha1-06"]
17+
js = ["oauth1-request/js"]
18+
serde = ["oauth1-request/serde"]
19+
std = ["oauth1-request/std"]
20+
test = ["oauth1-request/test"]

oauth1-request-test/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub use oauth1_request::*;

0 commit comments

Comments
 (0)