updated workflows

Author: vr1087

.github/workflows/ci.yml

@@ -4,9 +4,15 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
+
+env:
+  CTEST_OUTPUT_ON_FAILURE: 1
+  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
 
 jobs:
   build-and-test:
@@ -16,26 +22,51 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
 
+      - name: Load cache
+        uses: actions/cache@v3
+        with:
+          path: "**/cpm_modules"
+          key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
+
       # ---------------------------
       # Part 1: C++ Build & CTest
       # ---------------------------
 
       - name: Install C++ build dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y build-essential cmake git python3-dev python3-pip
+          sudo apt-get install -y \
+            build-essential \
+            cmake \
+            git \
+            libcurl4-openssl-dev \
+            python3-dev \
+            python3-pip 
 
-      - name: Configure and build C++ code
+      - name: Build and install C++ tool
         run: |
           cd cpp
-          cmake -S standalone -B build/standalone -DCMAKE_BUILD_TYPE=Release
-          cmake --build build/standalone
+          cmake \
+            -S . \
+            -B build \
+            -DCMAKE_BUILD_TYPE=Release
+          cmake \
+            --build build \
+            --target install
 
-      - name: Run C++ unit tests with CTest
+      - name: Build and Run C++ tool unit tests
         run: |
-          cmake -S test -B build/test
-          cmake --build build/test
-          CTEST_OUTPUT_ON_FAILURE=1 cmake --build build/test --target test
+          cmake \
+            -S test \
+            -B build/test \
+            -DTEST_INSTALLED_VERSION=1
+          cmake \
+            --build build/test \
+            --config Debug \
+            -j4
+          cmake \
+            --build build/test \
+            --target test
 
       # -----------------------------
       # Part 2: Python install & tests

Dockerfile

@@ -21,8 +21,8 @@ COPY . .
 RUN pip3 install --upgrade pip setuptools scikit-build
 
 # 4) Manually configure, compile, and test the C++ code
-#    This builds 'linecount' and 'test_linecount', then runs CTest.
-RUN mkdir build && cd build \
+#    This builds 'Aligncount' and 'AligncountTests', then runs CTest.
+RUN cd cpp && mkdir build && cd build \
  && cmake .. -DCMAKE_BUILD_TYPE=Release \
  && cmake --build . --parallel $(nproc) \
  && ctest --output-on-failure

conda-recipe/meta.yaml

@@ -22,35 +22,52 @@ build:
   script: |
     
     # Configure & compile
-    cmake -S standalone -B build/standalone -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=Release
-    cmake --build build/standalone --parallel ${CPU_COUNT:-1}
+    cd cpp
+    cmake \
+      -S standalone \
+      -B build/standalone \
+      -DCMAKE_INSTALL_PREFIX=$PREFIX \
+      -DCMAKE_BUILD_TYPE=Release
+    cmake \
+      --build build/standalone \
+      --parallel ${CPU_COUNT:-1}
     
     # Run C++ unit tests (fail the build if any test fails)
-    cmake -S test -B build/test
-    cmake --build build/test
-    CTEST_OUTPUT_ON_FAILURE=1 cmake --build build/test --target test
+    cmake \
+      -S test \
+      -B build/test
+    cmake \
+      --build build/test
+    CTEST_OUTPUT_ON_FAILURE=1 cmake \
+      --build build/test \
+      --target test
     
     # install the cpp exe
-    cmake --install . --prefix $PREFIX
+    cmake \
+      --install . \
+      --prefix $PREFIX
 
   number: 0
 
 requirements:
   build:
+    - {{ compiler('c') }}
     - {{ compiler("cxx") }}
     - cmake
   host:
     # This environment only needs to run CMake and the C++ compiler
+    - {{ compiler('c') }}
     - {{ compiler("cxx") }}
     - cmake
 
 outputs:
   # ---------------------------------------------------------
   # Output #1: Arch‐specific C++ executable (aligncount-cpp)
   # ---------------------------------------------------------
-  - name: aligncount_cpp
+  - name: Aligncount
     requirements:
       host:
+        - {{ compiler('c') }}
         - {{ compiler("cxx") }}
         - cmake
       run:
@@ -60,7 +77,7 @@ outputs:
   # ---------------------------------------------------------
   # Output #2: Noarch Python wrapper (aligncount_demo)
   # ---------------------------------------------------------
-  - name: aligncount
+  - name: Aligncount_wrapper
     build:
       noarch: python
       script: |
@@ -80,7 +97,7 @@ outputs:
         - setuptools
       run:
         - python >=3.9,<3.14
-        - {{ pin_subpackage("aligncount_cpp", exact=False) }}
+        - {{ pin_subpackage("Aligncount", exact=False) }}
 
     test:
       requires: