Skip to content

Commit 07f7710

Browse files
mickemmickem
committed
Updated dependencies to MONGOOSE: 7.20, BOOST 1.86, LUA: 5.4.7
1 parent 7b7b5b0 commit 07f7710

10 files changed

Lines changed: 60 additions & 35 deletions

File tree

‎.github/actions/rest-test/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Validate that rest endpoints return expected results
44
runs:
55
using: composite
66
steps:
7-
- uses: actions/setup-node@v4
7+
- uses: actions/setup-node@v6
88
with:
99
node-version: 20
1010
cache: 'npm'

‎.github/dependabot.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,16 @@ updates:
88
- package-ecosystem: npm
99
directory: "/web"
1010
schedule:
11-
interval: "weekly"
11+
interval: "weekly"
12+
- package-ecosystem: cargo
13+
directory: "/rust/nscp_client"
14+
schedule:
15+
interval: "weekly"
16+
- package-ecosystem: pip
17+
directory: "/build/python"
18+
schedule:
19+
interval: "weekly"
20+
- package-ecosystem: pip
21+
directory: "tests/msi"
22+
schedule:
23+
interval: "weekly"

‎.github/workflows/build-linux.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ on:
1818

1919
env:
2020
TINY_XML_2_VERSION: 10.1.0
21-
MONGOOSE_VERSION: 7.19
21+
MONGOOSE_VERSION: 7.20
2222

2323
jobs:
2424
build:
2525
runs-on: ubuntu-latest
2626

2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
with:
3030
submodules: true
3131

@@ -37,7 +37,7 @@ jobs:
3737
cache-dependency-path: 'build/python/requirements.txt'
3838
cache: 'pip'
3939

40-
- uses: actions/setup-node@v4
40+
- uses: actions/setup-node@v6
4141
with:
4242
node-version: 20
4343
cache: 'npm'
@@ -82,7 +82,7 @@ jobs:
8282
set(MONGOOSE_SOURCE_DIR "${{ steps.mongoose.outputs.path_unix }}")
8383
set(CHECK_NSCLIENT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
8484
85-
- uses: actions/download-artifact@v6
85+
- uses: actions/download-artifact@v7
8686
with:
8787
name: check_nsclient-linux-${{ inputs.architecture }}
8888

‎.github/workflows/build-rust.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
working-directory: rust/nscp_client
3939

4040
steps:
41-
- uses: actions/checkout@v5
41+
- uses: actions/checkout@v6
4242

4343
- name: Calculate Target
4444
id: target

‎.github/workflows/build-windows-legacy.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ env:
3131
PYTHON_VERSION: 3.11
3232
OPENSSL_VERSION: 3.5.4
3333
PROTOBUF_VERSION: 21.12
34-
BOOST_VERSION: 1.83.0
34+
BOOST_VERSION: 1.86.0
3535
CRYPTOPP_VERSION: 8.9.0
36-
LUA_VERSION: 5.4.7
36+
LUA_VERSION: 5.4.8
3737
TINY_XML_2_VERSION: 10.1.0
3838
GOOGLE_TEST_VERSION: 1.12.1
39-
MONGOOSE_VERSION: 7.19
39+
MONGOOSE_VERSION: 7.20
4040

4141
jobs:
4242
build:
@@ -45,7 +45,7 @@ jobs:
4545
platform: ${{ steps.setup.outputs.platform }}
4646

4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
with:
5050
submodules: true
5151

@@ -68,7 +68,7 @@ jobs:
6868
cache-dependency-path: 'build/python/requirements.txt'
6969
cache: 'pip'
7070

71-
- uses: actions/setup-node@v4
71+
- uses: actions/setup-node@v6
7272
with:
7373
node-version: 20
7474
cache: 'npm'
@@ -282,7 +282,7 @@ jobs:
282282
needs: build
283283

284284
steps:
285-
- uses: actions/checkout@v5
285+
- uses: actions/checkout@v6
286286
with:
287287
submodules: true
288288

@@ -294,7 +294,7 @@ jobs:
294294
cache-dependency-path: 'build/python/requirements.txt'
295295
cache: 'pip'
296296

297-
- uses: actions/setup-node@v4
297+
- uses: actions/setup-node@v6
298298
with:
299299
node-version: 20
300300
cache: 'npm'
@@ -305,7 +305,7 @@ jobs:
305305
run: |
306306
mkdir -p tmp/nscp
307307
308-
- uses: actions/download-artifact@v6
308+
- uses: actions/download-artifact@v7
309309
with:
310310
name: NSCP-${{ inputs.version }}-${{ needs.build.outputs.platform }}-legacy-xp
311311
path: tmp/nscp

‎.github/workflows/build-windows.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ env:
3131
PYTHON_VERSION: 3.11
3232
OPENSSL_VERSION: 3.5.4
3333
PROTOBUF_VERSION: 21.12
34-
BOOST_VERSION: 1.83.0
34+
BOOST_VERSION: 1.86.0
3535
CRYPTOPP_VERSION: 8.9.0
36-
LUA_VERSION: 5.4.7
36+
LUA_VERSION: 5.4.8
3737
TINY_XML_2_VERSION: 10.1.0
3838
GOOGLE_TEST_VERSION: 1.12.1
39-
MONGOOSE_VERSION: 7.19
39+
MONGOOSE_VERSION: 7.20
4040

4141
jobs:
4242
build:
@@ -45,7 +45,7 @@ jobs:
4545
platform: ${{ steps.setup.outputs.platform }}
4646

4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
with:
5050
submodules: true
5151

@@ -68,7 +68,7 @@ jobs:
6868
cache-dependency-path: 'build/python/requirements.txt'
6969
cache: 'pip'
7070

71-
- uses: actions/setup-node@v4
71+
- uses: actions/setup-node@v6
7272
with:
7373
node-version: 20
7474
cache: 'npm'
@@ -213,7 +213,7 @@ jobs:
213213
& "$env:Python_ROOT_DIR\python" ..\..\build\python\mk_pyzip.py --source ${{ env.Python_ROOT_DIR }}
214214
shell: pwsh
215215

216-
- uses: actions/download-artifact@v6
216+
- uses: actions/download-artifact@v7
217217
with:
218218
name: check_nsclient-windows-${{ inputs.architecture }}
219219
path: tmp
@@ -299,7 +299,7 @@ jobs:
299299
needs: build
300300

301301
steps:
302-
- uses: actions/checkout@v5
302+
- uses: actions/checkout@v6
303303
with:
304304
submodules: true
305305

@@ -311,7 +311,7 @@ jobs:
311311
cache-dependency-path: 'build/python/requirements.txt'
312312
cache: 'pip'
313313

314-
- uses: actions/setup-node@v4
314+
- uses: actions/setup-node@v6
315315
with:
316316
node-version: 20
317317
cache: 'npm'
@@ -322,7 +322,7 @@ jobs:
322322
run: |
323323
mkdir -p tmp/nscp
324324
325-
- uses: actions/download-artifact@v6
325+
- uses: actions/download-artifact@v7
326326
with:
327327
name: NSCP-${{ inputs.version }}-${{ needs.build.outputs.platform }}
328328
path: tmp/nscp

‎.github/workflows/get-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
outputs:
1818
version: ${{ steps.version.outputs.version }}
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
with:
2222
submodules: true
2323
fetch-depth: 0

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: windows-latest
2121

2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
with:
2525
submodules: true
2626

@@ -29,16 +29,16 @@ jobs:
2929
with:
3030
python-version: ${{ ENV.PYTHON_VERSION }}
3131

32-
- uses: actions/download-artifact@v6
32+
- uses: actions/download-artifact@v7
3333
with:
3434
name: NSCP-${{ inputs.version }}-x64
35-
- uses: actions/download-artifact@v6
35+
- uses: actions/download-artifact@v7
3636
with:
3737
name: NSCP-${{ inputs.version }}-Win32
38-
- uses: actions/download-artifact@v6
38+
- uses: actions/download-artifact@v7
3939
with:
4040
name: NSCP-${{ inputs.version }}-Win32-legacy-xp
41-
- uses: actions/download-artifact@v6
41+
- uses: actions/download-artifact@v7
4242
with:
4343
name: NSCP-${{ inputs.version }}-ubuntu-x64
4444

‎CMakeLists.txt‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,22 @@ if(WIN32)
117117
install(FILES "${PROJECT_BINARY_DIR}/_socket.pyd" DESTINATION .)
118118
install(FILES "${PROJECT_BINARY_DIR}/unicodedata.pyd" DESTINATION .)
119119
endif()
120+
if(WIN32)
121+
# Target windows version
122+
if(USE_STATIC_RUNTIME)
123+
add_definitions(
124+
-DWINVER=0x0501
125+
-D_WIN32_WINNT=0x0501
126+
-DBOOST_USE_WINAPI_VERSION=0x501
127+
)
128+
else()
129+
add_definitions(
130+
-DWINVER=0x0601
131+
-D_WIN32_WINNT=0x0601
132+
-DBOOST_USE_WINAPI_VERSION=0x601
133+
)
134+
endif()
135+
endif()
120136
if(NOT DEFINED USE_STATIC_RUNTIME)
121137
set(USE_STATIC_RUNTIME FALSE)
122138
endif(NOT DEFINED USE_STATIC_RUNTIME)
@@ -135,10 +151,7 @@ if(USE_STATIC_RUNTIME)
135151
if(WIN32)
136152
# Workaround for building with XP support
137153
add_definitions(
138-
-DWINVER=0x0501
139-
-D_WIN32_WINNT=0x0501
140154
-DNTDDI_VERSION=0x05010000
141-
-DBOOST_USE_WINAPI_VERSION=0x501
142155
-DBOOST_NO_CXX17_HDR_SHARED_MUTEX
143156
-D_USING_V110_SDK71_
144157
)

‎build/python/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mkdocs==1.5.1
2-
protobuf==4.23.4
2+
protobuf==4.25.8
33
jinja2==3.1.6
44
mkdocs-material==9.1.21
55
lua-protobuf==2.0.3
66
md-protobuf==2.0.1
7-
setuptools==70.0.0
7+
setuptools==78.1.1

0 commit comments

Comments
 (0)