Skip to content

Commit 249c0e9

Browse files
committed
CI Restore to run all tests
1 parent 4de0691 commit 249c0e9

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

.github/workflows/tests.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,10 @@ jobs:
4242
matrix:
4343
build_variant: [ipv6only-no-ble-no-wifi]
4444

45-
<<<<<<< HEAD
4645
container:
4746
image: ghcr.io/project-chip/chip-build:133
4847
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
4948
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)
5549

5650
runs-on: ubuntu-latest
5751

@@ -109,7 +103,6 @@ jobs:
109103
path: /tmp/cores/
110104
retention-days: 5
111105

112-
<<<<<<< HEAD
113106

114107
- name: Build Apps
115108
run: |
@@ -418,12 +411,3 @@ jobs:
418411
path: objdir-clone/
419412
# objdirs are big; don't hold on to them too long.
420413
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)

0 commit comments

Comments
 (0)