Skip to content

Commit

Permalink
support building with GCC 13 & drop old OSs
Browse files Browse the repository at this point in the history
  • Loading branch information
kfix committed Jul 16, 2024
1 parent 3cabc24 commit 5507bed
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 26 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
16 changes: 0 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Reactor loop psuedo code:

## Install

### Build requirements (tested on Ubuntu 18.04/20.04)
### Build requirements

#### Packages
- openssl
Expand Down
1 change: 1 addition & 0 deletions include/is2/srvr/access.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
//! ----------------------------------------------------------------------------
#include "is2/nconn/scheme.h"
#include "is2/srvr/http_status.h"
#include <cstdint>
#include <sys/socket.h>
#include <string>
namespace ns_is2 {
Expand Down

0 comments on commit 5507bed

Please sign in to comment.