From 25a8c8289c12a1c1c3cc6ddcdc01b3dfcaf9ae33 Mon Sep 17 00:00:00 2001 From: James Bonfield Date: Tue, 25 Jun 2024 15:37:11 +0100 Subject: [PATCH] Amend .gitattributes file for more Windows text-mode removal --- .gitattributes | 10 ++++++++++ .github/workflows/windows-build.yml | 2 +- Makefile | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 5d9850bc7..c3989ba7e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,3 +24,13 @@ test/index_dos.sam -text # Remove the text attribute from various faidx test files test/faidx/faidx*.fa* -text test/faidx/fastqs*.fq* -text +test/fastq/*.fa -text +test/fastq/*.fq -text +*.tst -text +*.out -text +*.crai -text +*.bai -text +*.csi -text +*.gzi -text +*.bcf -text +*.sam.gz -text diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index b6f7cc99d..9a81ece69 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -29,7 +29,7 @@ jobs: export MSYSTEM=MINGW64 autoreconf -i ./configure - make -j32 + make -j6 - name: Check Htslib shell: msys2 {0} run: | diff --git a/Makefile b/Makefile index 99142c865..56334781a 100644 --- a/Makefile +++ b/Makefile @@ -588,6 +588,9 @@ SRC = $(srcprefix) # If using MSYS, avoid poor shell expansion via: # MSYS2_ARG_CONV_EXCL="*" make check check test: all $(HTSCODECS_TEST_TARGETS) + hexdump -C test/minimal.fq + hexdump -C test/minimal.sam + ./test/test_view test/fastq/minimal.fq | hexdump -C test/hts_endian test/test_expr test/test_kfunc