@@ -130,31 +130,31 @@ jobs:
130130 - {
131131 target : x86_64-pc-windows-msvc,
132132 os : windows-latest,
133- cross : false ,
133+ runner : ' cargo ' ,
134134 command : " test" ,
135135 }
136136 - {
137137 target : x86_64-unknown-linux-gnu,
138138 os : ubuntu-latest,
139- cross : false ,
139+ runner : ' cargo ' ,
140140 command : " test" ,
141141 }
142142 - {
143143 target : x86_64-apple-darwin,
144144 os : macos-latest,
145- cross : false ,
145+ runner : ' cargo ' ,
146146 command : " test" ,
147147 }
148148 - {
149149 target : aarch64-apple-ios,
150150 os : macos-latest,
151- cross : false ,
151+ runner : ' cargo ' ,
152152 command : " build" ,
153153 }
154154 - {
155155 target : aarch64-linux-android,
156156 os : ubuntu-latest,
157- cross : true ,
157+ runner : ' cross ' ,
158158 command : " build" ,
159159 }
160160
@@ -175,13 +175,13 @@ jobs:
175175 echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
176176 vcpkg install openssl:x64-windows-static-md
177177
178- - uses : dtolnay/rust-toolchain@1.65 .0
178+ - uses : dtolnay/rust-toolchain@1.70 .0
179179 with :
180180 targets : ${{ matrix.platform.target }}
181181
182182 - uses : Swatinem/rust-cache@v2
183183 with :
184- key : ${{ matrix.package }}
184+ key : cache- ${{ matrix.package }}
185185
186186 - name : create dummy dist
187187 working-directory : examples/api
@@ -192,34 +192,18 @@ jobs:
192192 run : |
193193 cargo update -p time@0.3.24 --precise 0.3.23
194194
195+ - name : install cross
196+ if : ${{ matrix.platform.runner == 'cross' }}
197+ run : cargo install cross --git https://github.com/cross-rs/cross
198+
195199 - name : test ${{ matrix.package }}
196200 if : matrix.package != 'tauri-plugin-sql'
197- uses : actions-rs/cargo@v1
198- with :
199- use-cross : ${{ matrix.platform.cross }}
200- command : ${{ matrix.platform.command }}
201- args : --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets
202-
203- - name : test ${{ matrix.package }} --all-features
204- if : ${{ !contains(fromJSON('["tauri-plugin-http", "tauri-plugin-upload", "tauri-plugin-updater", "tauri-plugin-websocket", "tauri-plugin-sql"]'), matrix.package) }}
205- uses : actions-rs/cargo@v1
206- with :
207- use-cross : ${{ matrix.platform.cross }}
208- command : ${{ matrix.platform.command }}
209- args : --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --all-features
201+ run : ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets
210202
211203 - name : test ${{ matrix.package }} mysql
212204 if : matrix.package == 'tauri-plugin-sql'
213- uses : actions-rs/cargo@v1
214- with :
215- use-cross : ${{ matrix.platform.cross }}
216- command : ${{ matrix.platform.command }}
217- args : --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql
205+ run : ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql
218206
219207 - name : test ${{ matrix.package }} postgres
220208 if : matrix.package == 'tauri-plugin-sql'
221- uses : actions-rs/cargo@v1
222- with :
223- use-cross : ${{ matrix.platform.cross }}
224- command : ${{ matrix.platform.command }}
225- args : --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres
209+ run : ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres
0 commit comments