File tree Expand file tree Collapse file tree 1 file changed +0
-16
lines changed Expand file tree Collapse file tree 1 file changed +0
-16
lines changed Original file line number Diff line number Diff line change @@ -42,16 +42,10 @@ jobs:
42
42
matrix :
43
43
build_variant : [ipv6only-no-ble-no-wifi]
44
44
45
- <<<<<<< HEAD
46
45
container :
47
46
image : ghcr.io/project-chip/chip-build:133
48
47
options : --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
49
48
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
50
- =======
51
- env :
52
- TSAN_OPTIONS : " halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
53
- BUILD_VARIANT : ${{ matrix.build_variant }}
54
- >>>>>>> ff4e9bb5b2 (`CI` Run only REPL tests)
55
49
56
50
runs-on : ubuntu-latest
57
51
@@ -109,7 +103,6 @@ jobs:
109
103
path : /tmp/cores/
110
104
retention-days : 5
111
105
112
- <<<<<<< HEAD
113
106
114
107
- name : Build Apps
115
108
run : |
@@ -418,12 +411,3 @@ jobs:
418
411
path : objdir-clone/
419
412
# objdirs are big; don't hold on to them too long.
420
413
retention-days : 5
421
- =======
422
- - name : Upload objdir
423
- uses : actions/upload-artifact@v4
424
- if : ${{ failure() && !env.ACT }}
425
- with :
426
- name : crash-objdir-linux-python-repl
427
- path : objdir-clone/
428
- retention-days : 5
429
- >>>>>>> ff4e9bb5b2 (`CI` Run only REPL tests)
You can’t perform that action at this time.
0 commit comments