WIP: remerge-diff: suppress conflict marker labels #1880
dschomain.yml
on: push
config
22s
fuzz smoke test
46s
static-analysis
3m 51s
sparse
5m 20s
documentation
4m 54s
Matrix: dockerized
Matrix: regular
Matrix: win+VS test
Matrix: win test
Annotations
66 errors and 15 warnings
|
linux-musl (alpine)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-musl (alpine)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-musl (alpine)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-musl (alpine)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-musl (alpine)
Process completed with exit code 1.
|
|
linux32 (i386/ubuntu:focal)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux32 (i386/ubuntu:focal)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux32 (i386/ubuntu:focal)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux32 (i386/ubuntu:focal)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux32 (i386/ubuntu:focal)
Process completed with exit code 1.
|
|
linux-gcc (ubuntu-20.04)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-gcc (ubuntu-20.04)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-gcc (ubuntu-20.04)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-gcc (ubuntu-20.04)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-gcc (ubuntu-20.04)
Process completed with exit code 1.
|
|
linux-gcc-default (ubuntu-latest)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-gcc-default (ubuntu-latest)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-gcc-default (ubuntu-latest)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-gcc-default (ubuntu-latest)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-gcc-default (ubuntu-latest)
Process completed with exit code 1.
|
|
linux-sha256 (ubuntu-latest)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-sha256 (ubuntu-latest)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-sha256 (ubuntu-latest)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-sha256 (ubuntu-latest)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-sha256 (ubuntu-latest)
Process completed with exit code 1.
|
|
linux-reftable (ubuntu-latest)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-reftable (ubuntu-latest)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-reftable (ubuntu-latest)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-reftable (ubuntu-latest)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-reftable (ubuntu-latest)
Process completed with exit code 1.
|
|
win test (6)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
win test (6)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
win test (6)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
win test (6)
failed: t4069.15 remerge-diff turns off history simplification
|
|
win test (6)
Process completed with exit code 1.
|
|
win test (3)
Process completed with exit code 1.
|
|
linux-leaks (ubuntu-latest)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-leaks (ubuntu-latest)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-leaks (ubuntu-latest)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-leaks (ubuntu-latest)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-leaks (ubuntu-latest)
Process completed with exit code 1.
|
|
linux-reftable-leaks (ubuntu-latest)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-reftable-leaks (ubuntu-latest)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-reftable-leaks (ubuntu-latest)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-reftable-leaks (ubuntu-latest)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-reftable-leaks (ubuntu-latest)
Process completed with exit code 1.
|
|
osx-clang (macos-13)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
osx-clang (macos-13)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
osx-clang (macos-13)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
osx-clang (macos-13)
failed: t4069.15 remerge-diff turns off history simplification
|
|
osx-clang (macos-13)
Process completed with exit code 1.
|
|
osx-reftable (macos-13)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
osx-reftable (macos-13)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
osx-reftable (macos-13)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
osx-reftable (macos-13)
failed: t4069.15 remerge-diff turns off history simplification
|
|
osx-reftable (macos-13)
Process completed with exit code 1.
|
|
linux-asan-ubsan (ubuntu-latest)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
linux-asan-ubsan (ubuntu-latest)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
linux-asan-ubsan (ubuntu-latest)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
linux-asan-ubsan (ubuntu-latest)
failed: t4069.15 remerge-diff turns off history simplification
|
|
linux-asan-ubsan (ubuntu-latest)
Process completed with exit code 1.
|
|
osx-gcc (macos-13)
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
osx-gcc (macos-13)
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
osx-gcc (macos-13)
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
osx-gcc (macos-13)
failed: t4069.15 remerge-diff turns off history simplification
|
|
osx-gcc (macos-13)
Process completed with exit code 1.
|
|
config
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
fuzz smoke test
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
pedantic (fedora)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
documentation
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux-musl (alpine)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux32 (i386/ubuntu:focal)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux-gcc-default (ubuntu-latest)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux-sha256 (ubuntu-latest)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux-reftable (ubuntu-latest)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux-leaks (ubuntu-latest)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
linux-reftable-leaks (ubuntu-latest)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
osx-clang (macos-13)
Already linked: /usr/local/Cellar/gettext/0.23
|
|
osx-reftable (macos-13)
Already linked: /usr/local/Cellar/gettext/0.23
|
|
linux-asan-ubsan (ubuntu-latest)
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
osx-gcc (macos-13)
Already linked: /usr/local/Cellar/gettext/0.23
|
Artifacts
Produced during runtime
| Name | Size | |
|---|---|---|
|
failed-tests-linux-asan-ubsan
|
21.9 KB |
|
|
failed-tests-linux-gcc
|
21.1 KB |
|
|
failed-tests-linux-gcc-default
|
21.8 KB |
|
|
failed-tests-linux-leaks
|
21.9 KB |
|
|
failed-tests-linux-musl
|
21.7 KB |
|
|
failed-tests-linux-reftable
|
22.6 KB |
|
|
failed-tests-linux-reftable-leaks
|
22.7 KB |
|
|
failed-tests-linux-sha256
|
24.2 KB |
|
|
failed-tests-linux32
|
21.8 KB |
|
|
failed-tests-osx-clang
|
22 KB |
|
|
failed-tests-osx-gcc
|
22.1 KB |
|
|
failed-tests-osx-reftable
|
22.5 KB |
|
|
failed-tests-windows-3
|
26.4 KB |
|
|
failed-tests-windows-6
|
21.4 KB |
|
|
windows-artifacts
|
209 MB |
|