@@ -4,6 +4,7 @@ on: [ push, pull_request ]
4
4
5
5
env :
6
6
CARGO_TERM_COLOR : always
7
+ ZLIB_VERSION : " 1.3"
7
8
8
9
jobs :
9
10
test-linux :
@@ -17,12 +18,14 @@ jobs:
17
18
continue-on-error : false
18
19
with :
19
20
path : |
20
- .cache/cargo/registry/index/
21
- .cache/cargo/registry/cache/
22
- .cache/cargo/git/db/
23
- key : ${{ runner.os }}-cargo
24
- restore-keys : ${{ runner.os }}-cargo
25
- - name : set up nginx source binary cache
21
+ ~/.cargo/bin/
22
+ ~/.cargo/registry/index/
23
+ ~/.cargo/registry/cache/
24
+ ~/.cargo/git/db/
25
+ target/
26
+ key : ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
27
+ restore-keys : ${{ runner.os }}-cargo-
28
+ - name : set up nginx deps cache
26
29
uses : actions/cache@v3
27
30
continue-on-error : false
28
31
with :
@@ -31,10 +34,10 @@ jobs:
31
34
.cache/*.tar.gz
32
35
.cache/*.tar.asc
33
36
.cache/*.tar.sig
34
- key : nginx -${{ hashFiles('**/nginx-sys/build.rs') }}
35
- restore-keys : nginx -
36
- - name : run tests in container
37
- run : make container- test
37
+ key : ${{ runner.os }}-deps -${{ hashFiles('**/nginx-sys/build.rs') }}
38
+ restore-keys : ${{ runner.os }}-deps -
39
+ - name : run tests
40
+ run : cargo test --verbose
38
41
39
42
test-macos :
40
43
name : Test (MacOS)
@@ -53,12 +56,14 @@ jobs:
53
56
continue-on-error : false
54
57
with :
55
58
path : |
59
+ ~/.cargo/bin/
56
60
~/.cargo/registry/index/
57
61
~/.cargo/registry/cache/
58
62
~/.cargo/git/db/
59
- key : ${{ runner.os }}-cargo
60
- restore-keys : ${{ runner.os }}-cargo
61
- - name : set up nginx source binary cache
63
+ target/
64
+ key : ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
65
+ restore-keys : ${{ runner.os }}-cargo-
66
+ - name : set up nginx deps cache
62
67
uses : actions/cache@v3
63
68
continue-on-error : false
64
69
with :
67
72
.cache/*.tar.gz
68
73
.cache/*.tar.asc
69
74
.cache/*.tar.sig
70
- key : nginx -${{ hashFiles('**/nginx-sys/build.rs') }}
71
- restore-keys : nginx -
75
+ key : ${{ runner.os }}-deps -${{ hashFiles('**/nginx-sys/build.rs') }}
76
+ restore-keys : ${{ runner.os }}-deps -
72
77
- name : run tests
73
78
uses : actions-rs/cargo@v1
74
79
env :
@@ -88,26 +93,45 @@ jobs:
88
93
toolchain : stable
89
94
override : true
90
95
- run : rustup component add rustfmt
91
- - uses : actions-rs/cargo@v1
92
- with :
93
- command : fmt
94
- args : --all -- --check
96
+ - name : cargo fmt
97
+ run : cargo fmt --all -- --check
95
98
96
- # clippy:
97
- # name: Clippy
98
- # runs-on: ubuntu-latest
99
- # steps:
100
- # - uses: actions/checkout@v3
101
- # - uses: actions-rs/toolchain@v1
102
- # with:
103
- # profile: minimal
104
- # toolchain: stable
105
- # override: true
106
- # - run: rustup component add clippy
107
- # - uses: actions-rs/cargo@v1
108
- # with:
109
- # command: clippy
110
- # args: -- -D warnings
99
+ clippy :
100
+ name : Clippy
101
+ runs-on : ubuntu-latest
102
+ steps :
103
+ - uses : actions/checkout@v3
104
+ - name : set up cargo cache
105
+ uses : actions/cache@v3
106
+ continue-on-error : false
107
+ with :
108
+ path : |
109
+ ~/.cargo/bin/
110
+ ~/.cargo/registry/index/
111
+ ~/.cargo/registry/cache/
112
+ ~/.cargo/git/db/
113
+ target/
114
+ key : ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
115
+ restore-keys : ${{ runner.os }}-cargo-
116
+ - name : set up nginx deps source cache
117
+ uses : actions/cache@v3
118
+ continue-on-error : false
119
+ with :
120
+ path : |
121
+ .cache/.gnupg
122
+ .cache/*.tar.gz
123
+ .cache/*.tar.asc
124
+ .cache/*.tar.sig
125
+ key : ${{ runner.os }}-deps-${{ hashFiles('**/nginx-sys/build.rs') }}
126
+ restore-keys : ${{ runner.os }}-deps-
127
+ - uses : actions-rs/toolchain@v1
128
+ with :
129
+ profile : minimal
130
+ toolchain : stable
131
+ override : true
132
+ components : rustfmt, clippy
133
+ - name : run clippy
134
+ run : cargo clippy -- -D warnings
111
135
112
136
# docs:
113
137
# name: Docs
0 commit comments