From 854f2fa95d57649f861b863e702cf155bfd43f75 Mon Sep 17 00:00:00 2001 From: Haakan T Johansson Date: Wed, 3 Dec 2025 23:58:12 +0100 Subject: [PATCH 1/4] Do not implicitly call std::string(0 /* nullptr */). Fixes CI build failure. --- src/Calibration.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Calibration.cc b/src/Calibration.cc index 8bee5260..6e5c58ce 100644 --- a/src/Calibration.cc +++ b/src/Calibration.cc @@ -624,7 +624,7 @@ std::string ISSCalibration::CaenType( unsigned int mod, unsigned int chan ){ } - return 0; + return ""; } @@ -714,7 +714,7 @@ std::string ISSCalibration::MesytecType( unsigned int mod, unsigned int chan ){ } - return 0; + return ""; } From 2a867efd6f2197fc97f26f2e82bee1f1852b8df6 Mon Sep 17 00:00:00 2001 From: Haakan T Johansson Date: Thu, 4 Dec 2025 00:33:58 +0100 Subject: [PATCH 2/4] Do not run github pages deplay for non-main branch, as it fails (permissions). --- .github/workflows/doxygen-gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml index f53f24e9..1a42279f 100644 --- a/.github/workflows/doxygen-gh-pages.yml +++ b/.github/workflows/doxygen-gh-pages.yml @@ -2,7 +2,7 @@ name: Doxygen GitHub Pages Deploy Action on: push: - branches: [ "*" ] + branches: [ "main" ] pull_request: branches: [ "main" ] From 306cde52f813e0a3613653433315736402b5dedb Mon Sep 17 00:00:00 2001 From: Haakan T Johansson Date: Thu, 4 Dec 2025 00:45:47 +0100 Subject: [PATCH 3/4] Also not for pull_requst for main, as that triggers for pull requests, but also do not pass CI with permission error. --- .github/workflows/doxygen-gh-pages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml index 1a42279f..1b62364d 100644 --- a/.github/workflows/doxygen-gh-pages.yml +++ b/.github/workflows/doxygen-gh-pages.yml @@ -3,8 +3,6 @@ name: Doxygen GitHub Pages Deploy Action on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] jobs: deploy: From 75f51ecce8f255c8a8435c7967987e282a005fdd Mon Sep 17 00:00:00 2001 From: Anna Kawecka Date: Mon, 15 Sep 2025 14:54:28 +0200 Subject: [PATCH 4/4] Splitting the option for -shared and setting a soname (library path). To make it easier to remove soname option. --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c07cf001..1d5d1368 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,12 @@ endif PLATFORM:=$(shell uname) ifeq ($(PLATFORM),Darwin) -SHAREDSWITCH = -Qunused-arguments -shared -undefined dynamic_lookup -dynamiclib -Wl,-install_name,'@executable_path/../lib/'# NO ENDING SPACE +SHAREDSWITCH = -Qunused-arguments -shared -undefined dynamic_lookup -dynamiclib +SONAMESWITCH = -Wl,-install_name,'@executable_path/../lib/'# NO ENDING SPACE OSDEF = -DMACOSX else -SHAREDSWITCH = -shared -Wl,-soname,# NO ENDING SPACE +SHAREDSWITCH = -shared +SONAMESWITCH = -Wl,-soname,# NO ENDING SPACE OSDEF = -DLINUX LIBEXTRA = -lrt endif @@ -91,10 +93,10 @@ DEPENDENCIES = $(INC_DIR)/AutoCalibrator.hh \ $(INC_DIR)/TIssData.hh all: $(BIN_DIR)/iss_sort $(LIB_DIR)/libiss_sort.so - + $(LIB_DIR)/libiss_sort.so: iss_sort.o $(OBJECTS) iss_sortDict.o mkdir -p $(LIB_DIR) - $(LD) iss_sort.o $(OBJECTS) iss_sortDict.o $(SHAREDSWITCH)$@ $(LIBS) -o $@ + $(LD) iss_sort.o $(OBJECTS) iss_sortDict.o $(SHAREDSWITCH) $(SONAMESWITCH)$@ $(LIBS) -o $@ $(BIN_DIR)/iss_sort: iss_sort.o $(OBJECTS) iss_sortDict.o mkdir -p $(BIN_DIR)