AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge PR #1272: Azure Pipelines: Use "python3" instead of "python" on macOS, restore inline if statement in version.py

Browse Source
This commit is contained in:
Davide Beatrici 2021-02-20 17:53:20 +01:00 committed by GitHub
commit cd889f78dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/azure-pipelines/macos_build.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
if [[ "${#SE_BUILD_NUMBER_TOKEN}" -eq 64 ]]; then if [[ "${#SE_BUILD_NUMBER_TOKEN}" -eq 64 ]]; then
VERSION=$(python "version.py") VERSION=$(python3 "version.py")
BUILD_NUMBER=$(curl "https://softether.network/get-build-number?commit=${BUILD_SOURCEVERSION}&version=${VERSION}&token=${SE_BUILD_NUMBER_TOKEN}") BUILD_NUMBER=$(curl "https://softether.network/get-build-number?commit=${BUILD_SOURCEVERSION}&version=${VERSION}&token=${SE_BUILD_NUMBER_TOKEN}")
else else
BUILD_NUMBER=0 BUILD_NUMBER=0

5
version.py
View File

@ -5,10 +5,7 @@ def main():
parser.add_argument('-n', '--newline', action = 'store_true', help = 'Break line after printing version') parser.add_argument('-n', '--newline', action = 'store_true', help = 'Break line after printing version')
args = parser.parse_args() args = parser.parse_args()
if args.newline: end = None if args.newline else ''
end = None
else:
end = ''
version = None version = None
with open('CMakeLists.txt', 'r') as file: with open('CMakeLists.txt', 'r') as file: