Skip to content

Commit 50b9a31

Browse files
committed
fix: fix build without onionreq
1 parent 156f340 commit 50b9a31

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

.github/workflows/test.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ concurrency:
1414
jobs:
1515
build:
1616
runs-on: ${{ matrix.os }}
17+
1718
strategy:
1819
fail-fast: false
20+
21+
1922
matrix:
20-
os: [windows-2022, macos-11, ubuntu-20.04]
23+
os: [windows-latest, macos-latest, ubuntu-latest]
24+
2125
env:
2226
SIGNAL_ENV: production
2327
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -29,6 +33,16 @@ jobs:
2933
with:
3034
submodules: 'recursive'
3135

36+
# this should only be needed on ubuntu-20.04
37+
38+
# - name: Force g++10 to be used
39+
# if: runner.os == 'Linux'
40+
# shell: bash
41+
# run: |
42+
# sudo apt install -y libstdc++-10-dev g++-10
43+
# 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
44+
# sudo update-alternatives --set gcc /usr/bin/gcc-10
45+
3246
- name: Install node
3347
uses: actions/setup-node@v3
3448
with:
@@ -48,6 +62,14 @@ jobs:
4862
run: |
4963
yarn global add node-gyp@latest
5064
65+
- name: sed it
66+
if: runner.os == 'Windows'
67+
shell: bash
68+
run: |
69+
sed -i "s/target_compile_options(oxen-logging-warnings INTERFACE/#target_compile_options(oxen-logging-warnings INTERFACE/" libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
70+
cat libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
71+
72+
5173
- name: build libsession-util-nodejs
5274
shell: bash
53-
run: yarn install --frozen-lockfile --network-timeout 600000
75+
run: yarn install --frozen-lockfile

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
2929
SET(CMAKE_BUILD_TYPE Release)
3030
SET(WITH_TESTS OFF)
3131

32-
set(CMAKE_CXX_STANDARD 17)
32+
set(CMAKE_CXX_STANDARD 20)
3333
set(CMAKE_CXX_STANDARD_REQUIRED ON)
3434
set(CMAKE_CXX_EXTENSIONS OFF)
3535

libsession-util

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"email": "[email protected]"
1010
},
1111
"scripts": {
12-
"install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF"
12+
"install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF --CDWITH_TESTS=OFF"
1313
},
1414
"devDependencies": {
1515
"clang-format": "^1.8.0"

0 commit comments

Comments
 (0)