File tree Expand file tree Collapse file tree 1 file changed +26
-26
lines changed
Expand file tree Collapse file tree 1 file changed +26
-26
lines changed Original file line number Diff line number Diff line change 1- <<<<<<< HEAD
1+ <<<<<<< HEAD
22name : Rust
33
44on :
@@ -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
You can’t perform that action at this time.
0 commit comments