From 2d76f672cd70c0fcfd918d48633e166c5a9b46eb Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Thu, 12 Jun 2025 20:20:57 -0700 Subject: [PATCH 1/3] .github/workflows/abismal_release_macos.yml: accidentally installing gsl which is not needed or used --- .github/workflows/abismal_release_macos.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/abismal_release_macos.yml b/.github/workflows/abismal_release_macos.yml index dcc7d56..ea648bf 100644 --- a/.github/workflows/abismal_release_macos.yml +++ b/.github/workflows/abismal_release_macos.yml @@ -17,11 +17,9 @@ jobs: run: sudo mkdir -p /opt/abismal/lib /opt/abismal/include - name: Install dependency headers and static libs run: | - brew install zlib gsl automake + brew install zlib automake sudo cp $(brew --prefix zlib)/lib/*.a /opt/abismal/lib - sudo cp $(brew --prefix gsl)/lib/*.a /opt/abismal/lib sudo cp -r $(brew --prefix zlib)/include/* /opt/abismal/include - sudo cp -r $(brew --prefix gsl)/include/* /opt/abismal/include - name: Build and install HTSlib run: | git clone --recursive https://github.com/samtools/htslib.git @@ -36,7 +34,7 @@ jobs: --disable-ref-cache \ --without-libdeflate \ LDADD="-L/usr/local/lib" - make CFLAGS="-Wall -O2 -fvisibility=hidden" libhts.a + make -j4 CFLAGS="-Wall -O2 -fvisibility=hidden" libhts.a sudo cp libhts.a /opt/abismal/lib - name: Build abismal run: | From 89646a98a1a1ca7e26777ec2148b3d6dd55a776c Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Thu, 12 Jun 2025 20:21:20 -0700 Subject: [PATCH 2/3] .github/workflows/abismal_release_linux.yml: adding threads to make for htslib --- .github/workflows/abismal_release_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/abismal_release_linux.yml b/.github/workflows/abismal_release_linux.yml index d286e07..78acf9c 100644 --- a/.github/workflows/abismal_release_linux.yml +++ b/.github/workflows/abismal_release_linux.yml @@ -35,7 +35,7 @@ jobs: --disable-lzma \ --disable-ref-cache \ LDADD="-L/usr/local/lib" && \ - make CFLAGS="-Wall -O2 -fvisibility=hidden" libhts.a && \ + make -j4 CFLAGS="-Wall -O2 -fvisibility=hidden" libhts.a && \ cp libhts.a /usr/local/lib/ && \ cp -r ../htslib /usr/local/include/ && \ cd /workspace && \ @@ -48,7 +48,7 @@ jobs: - name: Get version number id: get-vn run: | - awk '/AC_INIT/ {print "vn="$2}' configure.ac | sed -e "s/\[//; s/\]//; s/,//" >> "$GITHUB_OUTPUT" + awk '/AC_INIT/ {print "vn="$2}' configure.ac | sed "s/\[//; s/\]//; s/,//" >> "$GITHUB_OUTPUT" env: GH_TOKEN: ${{ github.token }} - name: Upload the binary From 241155c6955fc0687b96f2514a154cd9ce3bd5f8 Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Thu, 12 Jun 2025 20:23:17 -0700 Subject: [PATCH 3/3] .github/workflows/abismal_distcheck_ubuntu.yml: properly naming the distcheck step --- .github/workflows/abismal_distcheck_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abismal_distcheck_ubuntu.yml b/.github/workflows/abismal_distcheck_ubuntu.yml index 8b93039..f3272e3 100644 --- a/.github/workflows/abismal_distcheck_ubuntu.yml +++ b/.github/workflows/abismal_distcheck_ubuntu.yml @@ -8,7 +8,7 @@ on: branches: [ "master" ] jobs: - build: + distcheck: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4