From f81c3389042114dacbb0114cdaf89ad35a4ddf89 Mon Sep 17 00:00:00 2001 From: Benney Au Date: Thu, 28 Nov 2024 18:06:08 +1100 Subject: [PATCH 1/3] pin versions in github ci file --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95bbf90..46c0b15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,11 @@ on: jobs: build: strategy: + fail-fast: false matrix: os: - - ubuntu-latest - - macos-latest + - ubuntu-24.04 + - macos-12 runs-on: ${{ matrix.os }} steps: - name: checkout scm @@ -35,6 +36,7 @@ jobs: with: repository: ebiggers/libdeflate path: src/libs/deflate + ref: v1.22 - name: build deflate run: | @@ -49,6 +51,7 @@ jobs: with: repository: intel/isa-l path: src/libs/isa-l + ref: v2.31.0 - name: build isa-l run: | From a9952090e65920e55fd2e92ec3c5271268582e35 Mon Sep 17 00:00:00 2001 From: Benney Au Date: Thu, 28 Nov 2024 18:08:42 +1100 Subject: [PATCH 2/3] delete push triger --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46c0b15..941ba14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,5 @@ name: fastp ci on: - push: - branches: - - master pull_request: branches: - master From 0ffa93175dc797ddbe12e5adf4bb45d20e4d4253 Mon Sep 17 00:00:00 2001 From: Benney Au Date: Thu, 28 Nov 2024 18:11:32 +1100 Subject: [PATCH 3/3] Fix makefile to depend on changes in header files too --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7a4a7d4..3896861 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ TARGET := fastp BIN_TARGET := ${TARGET} CXX ?= g++ -CXXFLAGS := -std=c++11 -pthread -g -O3 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) ${CXXFLAGS} +CXXFLAGS := -std=c++11 -pthread -g -O3 -MD -MP -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) ${CXXFLAGS} LIBS := -lisal -ldeflate -lpthread STATIC_FLAGS := -static -Wl,--no-as-needed -pthread LD_FLAGS := $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS) $(LD_FLAGS) @@ -35,15 +35,11 @@ ${DIR_OBJ}/%.o:${DIR_SRC}/%.cpp .PHONY:clean .PHONY:static clean: - @if test -d $(DIR_OBJ) ; \ - then \ - find $(DIR_OBJ) -name *.o -delete; \ - fi - @if test -e $(TARGET) ; \ - then \ - rm $(TARGET) ; \ - fi + @rm -rf $(DIR_OBJ) + @rm -f $(TARGET) install: install $(TARGET) $(BINDIR)/$(TARGET) @echo "Installed." + +-include $(OBJ:.o=.d)