Skip to content

Commit de26198

Browse files
AxVultisAxVultis
authored
Merge pull request #320 from ConcealNetwork/development
Version 6.7.1
2 parents c2b395c + 5e66ea5 commit de26198

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2552
-2436
lines changed

‎.github/workflows/check.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
$os="windows"
2525
$ccx_version="${{ github.sha }}".SubString(0,7)
2626
$release_name="ccx-cli-$os-dev-$ccx_version"
27-
echo "::set-output name=release_name::${release_name}"
27+
echo "release_name=${release_name}" >> $env:GITHUB_OUTPUT
2828
2929
- name: Install msbuild
30-
uses: microsoft/setup-msbuild@v1.0.2
30+
uses: microsoft/setup-msbuild@v1.1.3
3131

3232
- name: Install dependencies
3333
shell: powershell
@@ -57,7 +57,7 @@ jobs:
5757
cp build/tests/Release/*_tests.exe build/conceal
5858
5959
- name: Upload To GH Artifacts
60-
uses: actions/upload-artifact@v2
60+
uses: actions/upload-artifact@v3
6161
with:
6262
name: ${{ steps.setup.outputs.release_name }}
6363
path: build/conceal
@@ -112,7 +112,7 @@ jobs:
112112
$os="mingw"
113113
$ccx_version="${{ github.sha }}".SubString(0,7)
114114
$release_name="ccx-cli-$os-dev-$ccx_version"
115-
echo "::set-output name=release_name::${release_name}"
115+
echo "release_name=${release_name}" >> $env:GITHUB_OUTPUT
116116
117117
- name: Build
118118
shell: msys2 {0}
@@ -135,7 +135,7 @@ jobs:
135135
cp build/tests/*_tests.exe build/conceal
136136
137137
- name: Upload To GH Artifacts
138-
uses: actions/upload-artifact@v2
138+
uses: actions/upload-artifact@v3
139139
with:
140140
name: ${{ steps.setup.outputs.release_name }}
141141
path: build/conceal
@@ -179,7 +179,7 @@ jobs:
179179
os=ubuntu-18.04
180180
ccx_version=${GITHUB_SHA::7}
181181
release_name=ccx-cli-"$os"-dev-"$ccx_version"
182-
echo "::set-output name=release_name::${release_name}"
182+
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
183183
184184
- name: Install dependencies
185185
run: |
@@ -204,7 +204,7 @@ jobs:
204204
cp build/tests/*_tests build/conceal
205205
206206
- name: Upload To GH Artifacts
207-
uses: actions/upload-artifact@v2
207+
uses: actions/upload-artifact@v3
208208
with:
209209
name: ${{ steps.setup.outputs.release_name }}
210210
path: build/conceal
@@ -249,7 +249,7 @@ jobs:
249249
os=ubuntu-20.04
250250
ccx_version=${GITHUB_SHA::7}
251251
release_name=ccx-cli-"$os"-dev-"$ccx_version"
252-
echo "::set-output name=release_name::${release_name}"
252+
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
253253
254254
- name: Install dependencies
255255
run: |
@@ -274,7 +274,7 @@ jobs:
274274
cp build/tests/*_tests build/conceal
275275
276276
- name: Upload To GH Artifacts
277-
uses: actions/upload-artifact@v2
277+
uses: actions/upload-artifact@v3
278278
with:
279279
name: ${{ steps.setup.outputs.release_name }}
280280
path: build/conceal
@@ -319,7 +319,7 @@ jobs:
319319
os=ubuntu-22.04
320320
ccx_version=${GITHUB_SHA::7}
321321
release_name=ccx-cli-"$os"-dev-"$ccx_version"
322-
echo "::set-output name=release_name::${release_name}"
322+
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
323323
324324
- name: Install dependencies
325325
run: |
@@ -344,7 +344,7 @@ jobs:
344344
cp build/tests/*_tests build/conceal
345345
346346
- name: Upload To GH Artifacts
347-
uses: actions/upload-artifact@v2
347+
uses: actions/upload-artifact@v3
348348
with:
349349
name: ${{ steps.setup.outputs.release_name }}
350350
path: build/conceal
@@ -389,7 +389,7 @@ jobs:
389389
os=ubuntu-20.04-clang
390390
ccx_version=${GITHUB_SHA::7}
391391
release_name=ccx-cli-"$os"-dev-"$ccx_version"
392-
echo "::set-output name=release_name::${release_name}"
392+
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
393393
394394
- name: Install dependencies
395395
run: |
@@ -414,7 +414,7 @@ jobs:
414414
cp build/tests/*_tests build/conceal
415415
416416
- name: Upload To GH Artifacts
417-
uses: actions/upload-artifact@v2
417+
uses: actions/upload-artifact@v3
418418
with:
419419
name: ${{ steps.setup.outputs.release_name }}
420420
path: build/conceal
@@ -459,7 +459,7 @@ jobs:
459459
os=macos-11
460460
ccx_version=${GITHUB_SHA::7}
461461
release_name=ccx-cli-"$os"-dev-"$ccx_version"
462-
echo "::set-output name=release_name::${release_name}"
462+
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
463463
464464
- name: Install dependencies
465465
run: |
@@ -483,7 +483,7 @@ jobs:
483483
cp build/tests/*_tests build/conceal
484484
485485
- name: Upload To GH Artifacts
486-
uses: actions/upload-artifact@v2
486+
uses: actions/upload-artifact@v3
487487
with:
488488
name: ${{ steps.setup.outputs.release_name }}
489489
path: build/conceal

‎.github/workflows/macOS.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,19 @@ jobs:
3030
zip -r "$release_name".zip "$release_name"
3131
sha256=$(shasum -a 256 "$release_name".zip | awk '{print toupper($1)}')
3232
asset_path="./$build_folder$release_name.zip"
33-
echo "::set-output name=sha256::${sha256}"
34-
echo "::set-output name=release_name::${release_name}.zip"
35-
echo "::set-output name=asset_path::${asset_path}"
36-
echo "::set-output name=ccx_version::${ccx_version}"
33+
echo "sha256=${sha256}" >> $GITHUB_OUTPUT
34+
echo "release_name=${release_name}.zip" >> $GITHUB_OUTPUT
35+
echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
36+
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
3737
38-
# since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
39-
# use v0.1.12 for now
4038
- name: Create Release
41-
uses: softprops/action-gh-release@v0.1.12
39+
uses: softprops/action-gh-release@v0.1.15
4240
with:
4341
files: ${{ steps.build.outputs.asset_path }}
4442
name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
4543
body: |
4644
[Download for macOS](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
4745
`SHA256 : ${{ steps.build.outputs.sha256 }}`
46+
append_body: true
4847
env:
4948
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ubuntu18.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,19 @@ jobs:
3333
tar -czf "$release_name".tar.gz "$ccx_ver_folder"
3434
sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
3535
asset_path="./$build_folder/$release_name/$release_name.tar.gz"
36-
echo "::set-output name=sha256::${sha256}"
37-
echo "::set-output name=release_name::${release_name}.tar.gz"
38-
echo "::set-output name=asset_path::${asset_path}"
39-
echo "::set-output name=ccx_version::${ccx_version}"
36+
echo "sha256=${sha256}" >> $GITHUB_OUTPUT
37+
echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
38+
echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
39+
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
4040
41-
# since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
42-
# use v0.1.12 for now
4341
- name: Create Release
44-
uses: softprops/action-gh-release@v0.1.12
42+
uses: softprops/action-gh-release@v0.1.15
4543
with:
4644
files: ${{ steps.build.outputs.asset_path }}
4745
name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
4846
body: |
4947
[Download for Ubuntu 18.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
5048
`SHA256 : ${{ steps.build.outputs.sha256 }}`
49+
append_body: true
5150
env:
5251
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ubuntu20.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,19 @@ jobs:
3737
tar -czf "$release_name".tar.gz "$ccx_ver_folder"
3838
sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
3939
asset_path="./$build_folder/$release_name/$release_name.tar.gz"
40-
echo "::set-output name=sha256::${sha256}"
41-
echo "::set-output name=release_name::${release_name}.tar.gz"
42-
echo "::set-output name=asset_path::${asset_path}"
43-
echo "::set-output name=ccx_version::${ccx_version}"
40+
echo "sha256=${sha256}" >> $GITHUB_OUTPUT
41+
echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
42+
echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
43+
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
4444
45-
# since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
46-
# use v0.1.12 for now
4745
- name: Create Release
48-
uses: softprops/action-gh-release@v0.1.12
46+
uses: softprops/action-gh-release@v0.1.15
4947
with:
5048
files: ${{ steps.build.outputs.asset_path }}
5149
name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
5250
body: |
5351
[Download for Ubuntu 20.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
5452
`SHA256 : ${{ steps.build.outputs.sha256 }}`
53+
append_body: true
5554
env:
5655
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ubuntu22.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,19 @@ jobs:
3737
tar -czf "$release_name".tar.gz "$ccx_ver_folder"
3838
sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
3939
asset_path="./$build_folder/$release_name/$release_name.tar.gz"
40-
echo "::set-output name=sha256::${sha256}"
41-
echo "::set-output name=release_name::${release_name}.tar.gz"
42-
echo "::set-output name=asset_path::${asset_path}"
43-
echo "::set-output name=ccx_version::${ccx_version}"
40+
echo "sha256=${sha256}" >> $GITHUB_OUTPUT
41+
echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
42+
echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
43+
echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
4444
45-
# since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
46-
# use v0.1.12 for now
4745
- name: Create Release
48-
uses: softprops/action-gh-release@v0.1.12
46+
uses: softprops/action-gh-release@v0.1.15
4947
with:
5048
files: ${{ steps.build.outputs.asset_path }}
5149
name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
5250
body: |
5351
[Download for Ubuntu 22.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
5452
`SHA256 : ${{ steps.build.outputs.sha256 }}`
53+
append_body: true
5554
env:
5655
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/windows.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@master
1616

1717
- name: Setup msbuild
18-
uses: microsoft/setup-msbuild@v1.0.2
18+
uses: microsoft/setup-msbuild@v1.1.3
1919

2020
- name: Install Boost
2121
shell: powershell
@@ -42,20 +42,19 @@ jobs:
4242
$asset_path = "./$build_folder/src/Release/$release_name.zip"
4343
mkdir "$release_name"
4444
cp *.exe "$release_name/"
45-
echo "::set-output name=sha256::${sha256}"
46-
echo "::set-output name=release_name::${release_name}.zip"
47-
echo "::set-output name=asset_path::${asset_path}"
48-
echo "::set-output name=ccx_version::${ccx_version}"
45+
echo "sha256=${sha256}" >> $env:GITHUB_OUTPUT
46+
echo "release_name=${release_name}.zip" >> $env:GITHUB_OUTPUT
47+
echo "asset_path=${asset_path}" >> $env:GITHUB_OUTPUT
48+
echo "ccx_version=${ccx_version}" >> $env:GITHUB_OUTPUT
4949
50-
# since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
51-
# use v0.1.12 for now
5250
- name: Create Release
53-
uses: softprops/action-gh-release@v0.1.12
51+
uses: softprops/action-gh-release@v0.1.15
5452
with:
5553
files: ${{ steps.build.outputs.asset_path }}
5654
name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
5755
body: |
5856
[Download for Windows](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
5957
`SHA256 : ${{ steps.build.outputs.sha256 }}`
58+
append_body: true
6059
env:
6160
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.0)
22

33
include(CheckCXXCompilerFlag)
4-
set(VERSION "6.7.0")
4+
set(VERSION "6.7.1")
55
set(VERSION_BUILD_NO "Trebopala")
66
# Packaged from main commits
77
set(COMMIT 1db6e66)

‎external/miniupnpc/.gitignore‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
deb_dist/
2+
build/
3+
.*.swp
4+
*.o
5+
*.a
6+
*.so
7+
*.dll
8+
*.dll.def
9+
*.exe
10+
*.lib
11+
*.dylib
12+
Makefile.bak
13+
miniupnpcstrings.h
14+
rc_version.h
15+
pythonmodule
16+
pythonmodule3
17+
upnpc-shared
18+
upnpc-static
19+
minihttptestserver
20+
minixmlvalid
21+
testminiwget
22+
validateminiwget
23+
validateminixml
24+
java/miniupnpc_*.jar
25+
_jnaerator.*
26+
out.errors.txt
27+
jnaerator-*.jar
28+
miniupnpc.h.bak
29+
testupnpreplyparse
30+
validateupnpreplyparse
31+
testportlistingparse
32+
validateportlistingparse
33+
listdevices
34+
testigddescparse
35+
validateigddescparse
36+
dist/
37+
miniupnpc.egg-info/
38+
init
39+
miniupnpc.pc
40+
testaddr_is_reserved
41+
validateaddr_is_reserved
42+
wingenminiupnpcstrings

0 commit comments

Comments
 (0)