diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc10b21..789103c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,9 +10,10 @@ on: jobs: build: + timeout-minutes: 30 strategy: matrix: - os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, macos-latest] + os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04] fail-fast: false runs-on: ${{ matrix.os }} @@ -23,22 +24,17 @@ jobs: fetch-depth: 0 - name: Install Ubuntu 22 dependencies - if: matrix.os == 'ubuntu-22.04' + if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04' run: | sudo apt-get update sudo apt-get install -y libunwind-dev libgoogle-perftools-dev rapidjson-dev - - name: Install Ubuntu 20/18 dependencies - if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' + - name: Install Ubuntu 20 dependencies + if: matrix.os == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libgoogle-perftools-dev rapidjson-dev - - name: Install macOS dependencies - if: matrix.os == 'macos-latest' - run: | - brew install cmake gperftools dpkg rapidjson - - name: Run build script run: | ./build.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index eba672b..9396498 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,22 +55,6 @@ if(BUILD_TLS) add_definitions(-DBUILD_TLS_WITH_OPENSSL=1) endif() # ------------------------------------------------------------------------------ -# OS X specific code -# ------------------------------------------------------------------------------ -IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - SET(OperatingSystem "Mac OS X") - INCLUDE_DIRECTORIES(/usr/local/opt/rapidjson/include) - # Add MacPorts - if(BUILD_TLS) - INCLUDE_DIRECTORIES(/usr/local/opt/openssl/include) - LINK_DIRECTORIES(/usr/local/opt/openssl/lib) - endif() - if(BUILD_TCMALLOC OR BUILD_PROFILER) - INCLUDE_DIRECTORIES(/usr/local/opt/gperftools/include) - LINK_DIRECTORIES(/usr/local/opt/gperftools/lib) - endif() -ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -# ------------------------------------------------------------------------------ # fortify options # ------------------------------------------------------------------------------ if (FORTIFY) diff --git a/README.md b/README.md index 020c79b..f17afc7 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Reactor loop psuedo code: ## Install -### Build requirements (tested on Ubuntu 18.04/20.04) +### Build requirements #### Packages - openssl diff --git a/include/is2/srvr/access.h b/include/is2/srvr/access.h index 5288b09..f9059b7 100644 --- a/include/is2/srvr/access.h +++ b/include/is2/srvr/access.h @@ -14,6 +14,7 @@ //! ---------------------------------------------------------------------------- #include "is2/nconn/scheme.h" #include "is2/srvr/http_status.h" +#include #include #include namespace ns_is2 {