From 8a6da6557138acb6b78f1f14e2816a0336b20972 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 1 Jul 2024 10:33:22 +1000 Subject: [PATCH] fix: fix build without onionreq --- .github/workflows/test.yml | 23 +++++++++++++++++++++++ CMakeLists.txt | 2 +- libsession-util | 2 +- package.json | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 11e6872..2577091 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,10 +14,19 @@ concurrency: jobs: build: runs-on: ${{ matrix.os }} + continue-on-error: true + strategy: fail-fast: false + + matrix: os: [windows-2022, macos-11, ubuntu-20.04] + include: + - runs-on: ubuntu-20.04 + compiler: gcc + gcc: 10 + env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -29,6 +38,14 @@ jobs: with: submodules: 'recursive' + - name: Install libstdc++-10-dev on ubuntu-20.04 + if: runner.os == 'Linux' + shell: bash + run: | + sudo apt install -y libstdc++-10-dev g++-10 + + + - name: Install node uses: actions/setup-node@v3 with: @@ -48,6 +65,12 @@ jobs: run: | yarn global add node-gyp@latest + + - name: build libsession-util-nodejs shell: bash run: yarn install --frozen-lockfile --network-timeout 600000 + + - name: pritn cmake files + shell: bash + run: cat build/compile_commands.json diff --git a/CMakeLists.txt b/CMakeLists.txt index bc8cdb9..46176e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ SET(CMAKE_EXPORT_COMPILE_COMMANDS ON) SET(CMAKE_BUILD_TYPE Release) SET(WITH_TESTS OFF) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/libsession-util b/libsession-util index 330545f..79f5c3b 160000 --- a/libsession-util +++ b/libsession-util @@ -1 +1 @@ -Subproject commit 330545f9d07c2c433861b822ebe51b9ca955d7ca +Subproject commit 79f5c3b9837e6c2f4a946d34d40f8af3500b6b15 diff --git a/package.json b/package.json index ee5391b..8612fb8 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "email": "team@oxen.io" }, "scripts": { - "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF" + "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF --CDWITH_TESTS=OFF --log-level=silly --CDVERBOSE=ON" }, "devDependencies": { "clang-format": "^1.8.0"