Skip to content

Commit 00f8f80

Browse files
Try again lint test
1 parent 72fd6e9 commit 00f8f80

File tree

4 files changed

+85
-98
lines changed

4 files changed

+85
-98
lines changed

.github/workflows/ci.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,30 @@ env:
1717
RUSTFLAGS: -Dwarnings
1818

1919
jobs:
20-
lint:
21-
name: Lint
22-
uses: ./.github/workflows/lint.yml
23-
24-
test:
25-
name: Test
26-
uses: ./.github/workflows/test.yml
20+
lint_test:
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
os: [ubuntu-24.04, macos-14, windows-2022]
25+
feature-args: ['', '-Funstable-mobile-app']
26+
include:
27+
- os: ubuntu-24.04
28+
display-os: Linux
29+
- os: macos-14
30+
display-os: macOS
31+
- os: windows-2022
32+
display-os: Windows
33+
- feature-args: ''
34+
feature-suffix: ''
35+
- feature-args: '-Funstable-mobile-app'
36+
feature-suffix: ' (-Funstable-mobile-app)'
37+
name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
38+
uses: ./.github/workflows/lint_test.yml
39+
with:
40+
os: ${{ matrix.os }}
41+
feature-args: ${{ matrix.feature-args }}
42+
display-os: ${{ matrix.display-os }}
43+
feature-suffix: ${{ matrix.feature-suffix }}
2744

2845
test_node:
2946
name: Test Node
@@ -36,11 +53,11 @@ jobs:
3653
required:
3754
name: Check required jobs
3855
runs-on: ubuntu-24.04
39-
needs: [lint, test, test_node, test_swift]
56+
needs: [lint_test, test_node, test_swift]
4057
if: always()
4158
steps:
4259
- name: Check for failure
43-
if: ${{ needs.lint.result != 'success' || needs.test.result != 'success' || needs.test_node.result != 'success' || needs.test_swift.result != 'success' }}
60+
if: ${{ needs.lint_test.result != 'success' || needs.test_node.result != 'success' || needs.test_swift.result != 'success' }}
4461
run: |
4562
echo "One or more jobs failed"
4663
exit 1

.github/workflows/lint.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/lint_test.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Lint & Test Rust
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
os:
7+
required: true
8+
type: string
9+
feature-args:
10+
required: false
11+
type: string
12+
default: ''
13+
display-os:
14+
required: false
15+
type: string
16+
default: ${{ inputs.os }}
17+
feature-suffix:
18+
required: false
19+
type: string
20+
default: ${{ inputs.feature-args }}
21+
22+
env:
23+
RUSTFLAGS: -Dwarnings
24+
25+
jobs:
26+
lint:
27+
name: Lint
28+
runs-on: ${{ inputs.os }}
29+
steps:
30+
- name: Checkout repo
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
32+
33+
- name: Install Rust Toolchain
34+
run: rustup toolchain install stable --profile minimal --component clippy --component rustfmt --no-self-update
35+
36+
- name: Rust-Cache
37+
uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
38+
39+
- name: Check formatting
40+
run: cargo fmt --all -- --check
41+
42+
- name: Lint
43+
run: cargo clippy --workspace --tests ${{ inputs.feature-args }}
44+
45+
test:
46+
name: Test
47+
runs-on: ${{ inputs.os }}
48+
steps:
49+
- name: Checkout repo
50+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
51+
52+
- name: Install Rust Toolchain
53+
run: rustup toolchain install stable --profile minimal --component clippy --component rustfmt --no-self-update
54+
55+
- name: Rust-Cache
56+
uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
57+
58+
- name: Test
59+
run: cargo test --all ${{ inputs.feature-args }}

.github/workflows/test.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)