Skip to content

Commit

Permalink
fix: fix build without onionreq
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilb committed Jul 1, 2024
1 parent 0456424 commit 21ce058
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
21 changes: 20 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@ concurrency:
jobs:
build:
runs-on: ${{ matrix.os }}

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 }}
Expand All @@ -29,6 +37,16 @@ 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
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10
sudo update-alternatives --set gcc /usr/bin/gcc-10
- name: Install node
uses: actions/setup-node@v3
with:
Expand All @@ -50,4 +68,5 @@ jobs:
- name: build libsession-util-nodejs
shell: bash
run: yarn install --frozen-lockfile --network-timeout 600000
run: yarn install --frozen-lockfile --network-timeout 600000

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion libsession-util
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"email": "[email protected]"
},
"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"
},
"devDependencies": {
"clang-format": "^1.8.0"
Expand Down

0 comments on commit 21ce058

Please sign in to comment.