Merge 56c146e6c0 into 9f01143c83

Standardized writing style

.github/workflows/coverity.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           submodules: true
 
-    - name: Install apt dependencies
+      - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev libsodium-dev

.github/workflows/fedora-rawhide.yml

@@ -7,14 +7,13 @@ on:
   pull_request:
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   build_and_test:
     strategy:
       matrix:
-        cc: [ gcc, clang ]
+        cc:
+          - gcc
+          - clang
     name: ${{ matrix.cc }}
     runs-on: ubuntu-latest
     container:

.github/workflows/linux.yml

@@ -1,8 +1,8 @@
 name: Linux
-on: [push, pull_request]
 
-permissions:
+on:
-  contents: read
+  push:
+  pull_request:
 
 jobs:
   build_and_test:
@@ -10,12 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get -y install cmake gcc g++ ninja-build libncurses5-dev libreadline-dev libsodium-dev libssl-dev make zlib1g-dev liblz4-dev libnl-genl-3-dev 
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install cmake gcc g++ ninja-build libncurses5-dev libreadline-dev libsodium-dev libssl-dev make zlib1g-dev liblz4-dev libnl-genl-3-dev 
 
       - name: Build
         run: |

.github/workflows/macos.yml

@@ -1,14 +1,18 @@
 name: macOS
-on: [push, pull_request, workflow_dispatch]
 
-permissions:
+on:
-  contents: read
+  push:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [macos-14, macos-13, macos-12]
+        os:
+          - macos-14
+          - macos-13
+          - macos-12
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/musl.yml

@@ -1,9 +1,8 @@
 name: Alpine/musl
 
-on: [push, pull_request]
+on:
-
+  push:
-permissions:
+  pull_request:
-  contents: read
 
 jobs:
   musl:
@@ -14,7 +13,8 @@ jobs:
     steps:
 
       - name: Install dependencies
-        run: apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv 
+        run: |
+          apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv 
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -22,7 +22,9 @@ jobs:
           submodules: true
 
       - name: Configure
-        run: ./configure
+        run: |
+          ./configure
 
       - name: make 
-        run: make -C build
+        run: |
+          make -C build

.github/workflows/stb_check.yml

@@ -1,8 +1,8 @@
 name: STB Check
-on: [push, pull_request]
 
-permissions:
+on:
-  contents: read
+  push:
+  pull_request:
 
 jobs:
   check:

.github/workflows/windows.yml

@@ -1,16 +1,26 @@
 name: Windows
-on: [push, pull_request]
 
-permissions:
+on: 
-  contents: read
+  push:
+  pull_request:
 
 jobs:
   build_and_test:
     strategy:
       matrix:
         platform: [
-          { ARCHITECTURE: x86, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",     VCPKG_TRIPLET: "x86-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"},
+          {
-          { ARCHITECTURE: x64, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe", VCPKG_TRIPLET: "x64-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"}
+            ARCHITECTURE: x86,
+            COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",
+            VCPKG_TRIPLET: "x86-windows-static",
+            VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
+          },
+          {
+            ARCHITECTURE: x64,
+            COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe",
+            VCPKG_TRIPLET: "x64-windows-static",
+            VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
+          }
         ]
     runs-on: windows-latest
     name: ${{ matrix.platform.ARCHITECTURE }}
@@ -29,8 +39,7 @@ jobs:
 
       - name: Set version variables
         run: |
-        $v = python version.py
+          Write-Output "VERSION=$(python version.py)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding UTF8 -Append
-        echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
         shell: pwsh
 
       - name: Build

.github/workflows/windows_release.yml

@@ -1,4 +1,4 @@
-name: "Release"
+name: Release
 
 on:
   push:
@@ -20,26 +20,36 @@ jobs:
       upload_url: "${{ steps.create_release.outputs.upload_url }}"
     steps:
 
-      - name: "Checkout repository"
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: "Create GitHub release"
+      - name: Create GitHub release
         id: create_release
         uses: softprops/action-gh-release@v2
 
   build-windows:
     name: ${{ matrix.platform.ARCHITECTURE }}
     runs-on: windows-latest
-    needs: ["release"]
+    needs: release
     strategy:
       matrix:
         platform: [
-          { ARCHITECTURE: x86, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",     VCPKG_TRIPLET: "x86-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"},
+          {
-          { ARCHITECTURE: x64, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe", VCPKG_TRIPLET: "x64-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"}
+            ARCHITECTURE: x86,
+            COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",
+            VCPKG_TRIPLET: "x86-windows-static",
+            VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
+          },
+          {
+            ARCHITECTURE: x64,
+            COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe",
+            VCPKG_TRIPLET: "x64-windows-static",
+            VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
+          }
         ]
     steps:
 
-      - name: "Checkout repository"
+      - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: true
@@ -52,10 +62,10 @@ jobs:
  
       - name: Set version variables
         run: |
-          $b=(Get-Content CMakeSettings.json | Out-String | ConvertFrom-Json).environments.BuildNumber		
+          @(
-          echo "BUILD_NUMBER=$b" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+            "BUILD_NUMBER=$((Get-Content CMakeSettings.json | Out-String | ConvertFrom-Json).environments.BuildNumber)"
-          $v = python version.py
+            "VERSION=$(python version.py)"
-          echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          ) | Out-File -FilePath $Env:GITHUB_ENV -Encoding UTF8 -Append
         shell: pwsh
 
       - name: Build
@@ -80,13 +90,13 @@ jobs:
           Get-ChildItem -Recurse build/installers
         shell: pwsh
 
-      - name: "Upload softether-vpnclient"
+      - name: Upload softether-vpnclient
         uses: softprops/action-gh-release@v2
         with:
           files: "build/installers/softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
           name: "softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
           
-      - name: "Upload softether-vpnserver_vpnbridge"
+      - name: Upload softether-vpnserver_vpnbridge
         uses: softprops/action-gh-release@v2
         with:
           files: "build/installers/softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"