Merge remote-tracking branch 'proplib-template/main' into cross-platf…

…orm-cli-driver
NTIA · Nov 8, 2024 · eb05d93 · eb05d93
2 parents a11298e + d4146b5
commit eb05d93
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml
@@ -12,7 +12,6 @@ on:
 # Define the matrix for different operating systems
 jobs:
   build-and-test:
-    if: ${{ github.repository != 'NTIA/proplib-template' }}
     name: ${{ matrix.os }} / CMake ${{ matrix.cmakeVersion }}
     runs-on: ${{ matrix.os }}
     strategy:

diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -8,6 +8,8 @@ on:
     types: ["published"]
   pull_request:
     branches: ["main", "dev"]
+  push:
+    branches: ["main", "dev"]
   workflow_dispatch:
 
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
@@ -18,7 +20,6 @@ concurrency:
 
 jobs:
   build:
-    if: ${{ github.repository != 'NTIA/proplib-template' }}
     runs-on: ubuntu-latest
     steps:
         - name: Checkout repository
@@ -55,7 +56,7 @@ jobs:
             path: ./docs/html/
 
   deploy:
-    if: ${{ (github.event_name == 'release') && (github.repository != 'NTIA/proplib-template') }}
+    if: ${{ github.event_name == 'release' }}
     needs: build
     permissions:
       contents: read

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,6 @@ permissions:
 
 jobs:
   create_release_artifacts:
-    if: github.repository != 'NTIA/proplib-template'
     name: Create release artifacts
     runs-on: ${{ matrix.os }}
     strategy:

diff --git a/app/src/CommaSeparatedIterator.cpp b/app/src/CommaSeparatedIterator.cpp
@@ -5,11 +5,8 @@
 
 #include "Driver.h"
 
-#include <algorithm>  // for transform
-#include <cctype>     // for std::tolower
-#include <cstddef>    // for std::ptrdiff_t, std::size_t
-#include <fstream>    // for std::istream
-#include <iterator>   // for std::input_iterator_tag
+#include <cstddef>    // for std::size_t
+#include <istream>    // for std::istream
 #include <stdexcept>  // for std::runtime_error
 #include <string>     // for std::getline, std::string
 

diff --git a/app/src/Driver.cpp b/app/src/Driver.cpp
@@ -3,7 +3,14 @@
  */
 #include "Driver.h"
 
-#include <algorithm>  // for std::find
+#include <algorithm> // for std::find
+#include <fstream>   // for std::ifstream, std::ofstream
+#include <iomanip>   // for std::setw
+#include <ios>       // for std::left
+#include <iostream>  // for std::cerr
+#include <ostream>   // for std::endl
+#include <string>    // for std::string
+#include <vector>    // for std::vector
 
 /*******************************************************************************
  * Main function of the driver executable

diff --git a/app/src/DriverUtils.cpp b/app/src/DriverUtils.cpp
@@ -16,9 +16,9 @@
 #include <algorithm>  // for std::transform
 #include <cctype>     // for std::tolower
 #include <ctime>      // for localtime_{s,r}, std::{time, time_t, tm, strftime}
-#include <fstream>    // for std::ofstream
 #include <iomanip>    // for std::setfill, std::setw
 #include <iostream>   // for std::cerr, std::endl
+#include <ostream>    // for std::ostream
 #include <string>     // for std::stod, std::stoi, std::string
 
 /******************************************************************************

diff --git a/app/tests/TempTextFile.cpp b/app/tests/TempTextFile.cpp
@@ -19,7 +19,7 @@
 
 #include <algorithm>  // for std::remove
 #include <fstream>    // for std::ofstream
-#include <iostream>   // for std::cerr, std::cout, std::ios::trunc
+#include <iostream>   // for std::cerr, std::ios::trunc
 #include <ostream>    // for std::endl
 #include <stdexcept>  // for std::runtime_error
 #include <string>     // for std::string

diff --git a/app/tests/TestDriver.cpp b/app/tests/TestDriver.cpp
@@ -3,6 +3,8 @@
  */
 #include "TestDriver.h"
 
+#include <string>  // for std::string
+
 TEST_F(DriverTest, MissingOptionError1) {
     // Test case: missing option between two provided flags
     std::string cmd = executable + " -i -o out.txt";

diff --git a/app/tests/TestDriver.h b/app/tests/TestDriver.h
@@ -6,7 +6,6 @@
 #include "Driver.h"
 #include "TempTextFile.h"
 
-#include <algorithm>      // for std::replace
 #include <cstdio>         // for std::remove, std::perror
 #include <cstdlib>        // for std::system
 #include <gtest/gtest.h>  // GoogleTest