Skip to content

Commit 2c26c48

Browse files
Update rust.yml
1 parent cef0bb8 commit 2c26c48

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

.github/workflows/rust.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<<<<<<< HEAD
1+
<<<<<<< HEAD
22
name: Rust
33

44
on:
@@ -20,28 +20,28 @@ jobs:
2020
- name: Build
2121
run: cargo build --verbose
2222
- name: Run tests
23-
run: cargo test --verbose
24-
=======
25-
name: Rust
26-
27-
on:
28-
push:
29-
branches: [ "main" ]
30-
pull_request:
31-
branches: [ "main" ]
32-
33-
env:
34-
CARGO_TERM_COLOR: always
35-
36-
jobs:
37-
build:
38-
39-
runs-on: ubuntu-latest
40-
41-
steps:
42-
- uses: actions/checkout@v4
43-
- name: Build
44-
run: cargo build --verbose
45-
- name: Run tests
46-
run: cargo test --verbose
47-
>>>>>>> d3143323807030b82a179850cad53352137670fa
23+
run: cargo test --verbose
24+
=======
25+
name: Rust
26+
27+
on:
28+
push:
29+
branches: [ "main" ]
30+
pull_request:
31+
branches: [ "main" ]
32+
33+
env:
34+
CARGO_TERM_COLOR: always
35+
36+
jobs:
37+
build:
38+
39+
runs-on: ubuntu-latest
40+
41+
steps:
42+
- uses: actions/checkout@v4
43+
- name: Build
44+
run: cargo build --verbose
45+
- name: Run tests
46+
run: cargo test --verbose
47+
>>>>>>> d3143323807030b82a179850cad53352137670fa

0 commit comments

Comments
 (0)