diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 9cbf0436..5747dc5e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -18,10 +18,10 @@ jobs: # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. # You can convert this to a matrix build if you need cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -34,8 +34,7 @@ jobs: - name: Build # Build your program with the given configuration working-directory: ${{env.unit_test_dir}} - run: cmake --build $unit_test_dir/build - # --config ${{env.BUILD_TYPE}} + run: cmake --build $unit_test_dir/build --config ${{env.BUILD_TYPE}} - name: Test working-directory: $unit_test_dir/build diff --git a/.github/workflows/cmake2.yml b/.github/workflows/cmake2.yml new file mode 100644 index 00000000..8de34ca7 --- /dev/null +++ b/.github/workflows/cmake2.yml @@ -0,0 +1,27 @@ +name: CMake + +on: + push: + branches: [ "dev/**", "alpha" ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + env: + unit_test_dir: ${{github.workspace}}/test/catch + + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Build + uses: threeal/cmake-action@v2.0.0 + with: + source-dir: ${{env.unit_test_dir}} + diff --git a/src/estd/port/toolchain/gnuc.h b/src/estd/port/toolchain/gnuc.h index cb556312..f3e550ef 100644 --- a/src/estd/port/toolchain/gnuc.h +++ b/src/estd/port/toolchain/gnuc.h @@ -30,7 +30,7 @@ // https://stackoverflow.com/questions/259248/how-to-test-the-current-version-of-gcc-at-compile-time // GLIBC detection gleaned from // http://web.mit.edu/freebsd/head/contrib/wpa/src/utils/common.h -//#include // Apparently this pisses off Ubuntu somehow +#include #endif // If after all of above we still don't have one, manually create it