Skip to content

Commit

Permalink
r&d: features.h is vindicated
Browse files Browse the repository at this point in the history
  • Loading branch information
malachib committed Dec 6, 2024
1 parent becaf83 commit 4f6ee6f
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/cmake2.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
source-dir: ${{env.unit_test_dir}}

2 changes: 1 addition & 1 deletion src/estd/port/toolchain/gnuc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <features.h> // Apparently this pisses off Ubuntu somehow
#include <features.h>
#endif

// If after all of above we still don't have one, manually create it
Expand Down

0 comments on commit 4f6ee6f

Please sign in to comment.