update build and test pipeline (#55)

* update build and test pipeline - now includes macos * maybe macos fix * fix? * use sstream

Author: arne-vl

.github/workflows/cmake-clang-gcc.yaml

@@ -1,4 +1,4 @@
-name: CMake on Linux (GCC and Clang)
+name: CMake (Linux + macOS, GCC and Clang)
 
 on:
  push:
@@ -7,40 +7,50 @@ on:
  branches: [ "main" ]
 
 jobs:
- test:
- runs-on: ubuntu-latest
-
+ build-and-test:
  strategy:
  fail-fast: false
  matrix:
- build_type: [Release]
+ os: [ubuntu-latest, macos-latest]
+ build_type: [Debug, Release]
  c_compiler: [gcc, clang]
  include:
- - c_compiler: gcc
+ # Linux (GCC + Clang)
+ - os: ubuntu-latest
+ c_compiler: gcc
  cpp_compiler: g++
- - c_compiler: clang
+ - os: ubuntu-latest
+ c_compiler: clang
+ cpp_compiler: clang++
+ # macOS (Clang only)
+ - os: macos-latest
+ c_compiler: clang
  cpp_compiler: clang++
+ exclude:
+ # Don’t try gcc on macOS (not preinstalled)
+ - os: macos-latest
+ c_compiler: gcc
+
+ runs-on: ${{ matrix.os }}
 
  steps:
  - uses: actions/checkout@v4
 
- - name: Set reusable strings
- id: strings
- shell: bash
- run: echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+ - name: Set build dir
+ id: vars
+ run: echo "BUILD_DIR=${{ github.workspace }}/build-${{ matrix.os }}-${{ matrix.c_compiler }}-${{ matrix.build_type }}" >> $GITHUB_ENV
 
  - name: Configure CMake
  run: >
- cmake -B ${{ steps.strings.outputs.build-output-dir }}
+ cmake -B $BUILD_DIR
  -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
  -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
  -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
  -S ${{ github.workspace }}
 
  - name: Build
- run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+ run: cmake --build $BUILD_DIR --config ${{ matrix.build_type }}
 
  - name: Test
- working-directory: ${{ steps.strings.outputs.build-output-dir }}
+ working-directory: ${{ env.BUILD_DIR }}
  run: ctest --build-config ${{ matrix.build_type }}
-

src/errors.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
+#include <format>
 #include <stdexcept>
 
 // Main error class
 class TaskrError : public std::runtime_error {
  public:
- explicit TaskrError(const std::string &msg) : std::runtime_error("TaskrError: " + msg) {}
+ explicit TaskrError(const std::string &msg) : std::runtime_error(std::format("TaskrError: {}", msg)) {}
 };
 
 // CLI errors
@@ -17,16 +18,17 @@ class ArgError : public TaskrError {
 // Configuration errors
 class MultiConfigError : public TaskrError {
  public:
- explicit MultiConfigError(const std::string &msg) : TaskrError("Multiple configurations found: " + msg) {}
+ explicit MultiConfigError(const std::string &msg)
+ : TaskrError(std::format("Multiple configurations found: {}", msg)) {}
 };
 
 class FileNotFoundError : public TaskrError {
  public:
- explicit FileNotFoundError(const std::string &msg) : TaskrError("File not found: " + msg) {}
+ explicit FileNotFoundError(const std::string &msg) : TaskrError(std::format("File not found: {}", msg)) {}
 };
 
 // Parser Errors
 class ParseError : public TaskrError {
  public:
- explicit ParseError(const std::string &msg) : TaskrError("Parse error: " + msg) {}
+ explicit ParseError(const std::string &msg) : TaskrError(std::format("Parse error: {}", msg)) {}
 };

src/executor.hpp

@@ -3,6 +3,7 @@
 #include "config.h"
 #include "errors.hpp"
 #include <algorithm>
+#include <format>
 #include <unordered_set>
 #include <vector>
 
@@ -21,7 +22,7 @@ class TaskrExecutor {
 
  const Task *task = find_task(config, taskName);
  if (!task) {
- throw TaskrError("Task not found: " + taskName);
+ throw TaskrError(std::format("Task not found: {}", taskName));
  }
 
  visited.insert(task->name);

src/main.cpp

@@ -2,6 +2,7 @@
 #include "executor.hpp"
 #include "parser.hpp"
 #include "util.hpp"
+#include <format>
 #include <fstream>
 #include <iostream>
 #include <ostream>
@@ -124,7 +125,7 @@ int main(int argc, char *argv[]) {
  };
 
  if (config.environments.find(envName) == config.environments.end()) {
- throw TaskrError("No environment '" + envName + "' found in config");
+ throw TaskrError(std::format("No environment '{}' found in config", envName));
  }
 
  std::ifstream file(config.environments.at(envName).file);
@@ -144,7 +145,7 @@ int main(int argc, char *argv[]) {
  auto it = std::find(definedTasksAndAliases.begin(), definedTasksAndAliases.end(), taskName);
 
  if (it == definedTasksAndAliases.end()) {
- throw TaskrError("Task or alias '" + taskName + "' not found");
+ throw TaskrError(std::format("Task or alias '{}' not found", taskName));
  }
 
  executor.execute(config, taskName);

src/parser.hpp

@@ -3,7 +3,6 @@
 #include "config.h"
 #include "errors.hpp"
 #include "util.hpp"
-#include <cstdlib>
 #include <regex>
 #include <string>
 #include <unordered_map>

src/util.hpp

@@ -3,7 +3,7 @@
 #include "errors.hpp"
 #include <algorithm>
 #include <filesystem>
-#include <string>
+#include <sstream>
 #include <vector>
 
 namespace fs = std::filesystem;