Skip to content

Commit 1911a48

Browse files
committed
fix: disable sed on windows as not needed without libquic branch
1 parent 240f77c commit 1911a48

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@ jobs:
3131
with:
3232
submodules: 'recursive'
3333

34-
# this should only be needed on ubuntu-20.04
35-
36-
# - name: Force g++10 to be used
37-
# if: runner.os == 'Linux'
38-
# shell: bash
39-
# run: |
40-
# sudo apt install -y libstdc++-10-dev g++-10
41-
# 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
42-
# sudo update-alternatives --set gcc /usr/bin/gcc-10
43-
4434
- name: Install node
4535
uses: actions/setup-node@v3
4636
with:
@@ -60,12 +50,12 @@ jobs:
6050
run: |
6151
yarn global add node-gyp@latest
6252
63-
- name: sed it
64-
if: runner.os == 'Windows'
65-
shell: bash
66-
run: |
67-
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
68-
cat libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
53+
# - name: sed it
54+
# if: runner.os == 'Windows'
55+
# shell: bash
56+
# run: |
57+
# 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
58+
# cat libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
6959

7060
- name: build libsession-util-nodejs
7161
shell: bash

src/groups/meta_group_wrapper.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ Napi::Value MetaGroupWrapper::memberGetAll(const Napi::CallbackInfo& info) {
391391
return allMembers;
392392
});
393393
}
394+
394395
Napi::Value MetaGroupWrapper::memberGetAllPendingRemovals(const Napi::CallbackInfo& info) {
395396
return wrapResult(info, [&] {
396397
std::vector<session::config::groups::member> allMembersRemoved;

types/groups/metagroup.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ declare module 'libsession_util_nodejs' {
104104
public memberSetProfilePicture: MetaGroupWrapper['memberSetProfilePicture'];
105105

106106
// keys
107-
108107
public keysNeedsRekey: MetaGroupWrapper['keysNeedsRekey'];
109108
public keyRekey: MetaGroupWrapper['keyRekey'];
110109
public loadKeyMessage: MetaGroupWrapper['loadKeyMessage'];
@@ -118,6 +117,7 @@ declare module 'libsession_util_nodejs' {
118117

119118
export type MetaGroupActionsType =
120119
| ['init', GroupWrapperConstructor]
120+
121121
// shared actions
122122
| MakeActionCall<MetaGroupWrapper, 'needsPush'>
123123
| MakeActionCall<MetaGroupWrapper, 'push'>

0 commit comments

Comments
 (0)