Skip to content

Commit

Permalink
Update Workflows (#2)
Browse files Browse the repository at this point in the history
* update workflow to test reusables

* fix abseil build for windows

* use c++14 for cmake

* now with release workflows

---------

Co-authored-by: techbech <[email protected]>
  • Loading branch information
loglund and techbech authored Oct 4, 2023
1 parent 4b18ea2 commit 14328b0
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
Linux-cmake:
name: Linux Cmake
uses: steinwurf/linux-cmake-action/.github/workflows/action.yml@4.0.0
uses: steinwurf/linux-cmake-action/.github/workflows/action.yml@5.0.0
with:
extra_resolve_options: $EXTRA_RESOLVE_OPTIONS
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_mkspecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: Linux C++ make-specs
pull_request:
jobs:
Linux-mkspecs:
uses: steinwurf/linux-mkspecs-action/.github/workflows/action.yml@6.0.0
uses: steinwurf/linux-mkspecs-action/.github/workflows/action.yml@7.0.0
with:
extra_resolve_options: ${{ github.event.inputs.extra_resolve_options }}
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
MacOS-cmake:
name: MacOS Cmake
uses: steinwurf/macos-cmake-action/.github/workflows/action.yml@6.0.0
uses: steinwurf/macos-cmake-action/.github/workflows/action.yml@7.0.0
with:
extra_resolve_options: $EXTRA_RESOLVE_OPTIONS
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
Windows-cmake:
name: Windows Cmake
uses: steinwurf/windows-cmake-action/.github/workflows/action.yml@4.0.0
uses: steinwurf/windows-cmake-action/.github/workflows/action.yml@5.0.0
with:
extra_resolve_options: $EXTRA_RESOLVE_OPTIONS
concurrency:
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ include_guard(GLOBAL)

find_package(Python COMPONENTS Interpreter)

set(CMAKE_CXX_STANDARD 14)

# Use waf to resolve dependencies
if(NOT DEFINED STEINWURF_RESOLVE)
message(STATUS "Resolving dependencies...")
Expand Down
2 changes: 1 addition & 1 deletion NEWS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ every change, see the Git log.

Latest
------
* tbd
* Patch: Fix problems with CMake and Waf on Windows and Mac OS.

2.0.0
-----
Expand Down
3 changes: 3 additions & 0 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ def _absl(bld, cxxflags):
],
)

if bld.is_mkspec_platform("windows"):
cxxflags += " /DNOMINMAX"

bld.stlib(
target="absl",
source=sources,
Expand Down

0 comments on commit 14328b0

Please sign in to comment.