Merge pull request ConcealNetwork#330 from ConcealNetwork/development

Version 6.7.3
krypt0x · Feb 24, 2024 · 5a3d815 · 5a3d815
2 parents 18cb15e + 0ab3205
commit 5a3d815
Show file tree

Hide file tree

Showing 101 changed files with 13,403 additions and 1,521 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -11,9 +11,9 @@ on:
 jobs:
   build-windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
-      BOOST_ROOT: C:/local/boost_1_72_0
+      BOOST_ROOT: C:/local/boost_1_83_0
     steps:
       - uses: actions/checkout@master
 
@@ -29,11 +29,18 @@ jobs:
       - name: Install msbuild
         uses: microsoft/setup-msbuild@v1.1.3
 
-      - name: Install dependencies
+      - name: Restore Boost
+        uses: actions/cache@v3
+        id: restore-boost
+        with:
+          path: ${{env.BOOST_ROOT}}
+          key: boost_1_83_0-msvc-14.3-64
+
+      - name: Install Boost
+        if: steps.restore-boost.outputs.cache-hit != 'true'
         shell: powershell
         run: |
-          echo "${env:BOOST_ROOT}"
-          $Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
+          $Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
           (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
           Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"
 
@@ -43,7 +50,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON
+          cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON
           msbuild concealX.sln /p:Configuration=Release /m:2
 
       - name: Prepare release
@@ -91,7 +98,7 @@ jobs:
 
   build-mingw:
     name: MinGW
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: msys2/setup-msys2@v2
         with:
@@ -379,14 +386,14 @@ jobs:
 
   build-macos11:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@master
 
       - name: Prepare version
         id: setup
         run: |
-          os=macos-11
+          os=macos-12
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-cli-"$os"-dev-"$ccx_version"
           echo "release_name=${release_name}" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-macos:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@master
 
@@ -21,7 +21,7 @@ jobs:
           brew install gcc boost
           mkdir "$build_folder"
           cd "$build_folder"
-          cmake -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -DSTATIC=ON ..
+          cmake -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON ..
           make -j2
           mkdir "$release_name"
           exeFiles=()

diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml
@@ -27,7 +27,7 @@ jobs:
           release_name=ccx-cli-ubuntu-2004-v"$ccx_version"
           mkdir -p "$build_folder"
           cd "$build_folder"
-          cmake ../..
+          cmake ../.. -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON
           make -j2
           mkdir -p "$release_name/$ccx_ver_folder"
           exeFiles=()

diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml
@@ -27,7 +27,7 @@ jobs:
           release_name=ccx-cli-ubuntu-2204-v"$ccx_version"
           mkdir -p "$build_folder"
           cd "$build_folder"
-          cmake ../..
+          cmake ../.. -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON
           make -j2
           mkdir -p "$release_name/$ccx_ver_folder"
           exeFiles=()

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -8,20 +8,27 @@ on:
 jobs:
   build-windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
-      BOOST_ROOT: C:/local/boost_1_72_0
+      BOOST_ROOT: C:/local/boost_1_83_0
     steps:
       - uses: actions/checkout@master
 
       - name: Setup msbuild
         uses: microsoft/setup-msbuild@v1.1.3
 
+      - name: Restore Boost
+        uses: actions/cache@v3
+        id: restore-boost
+        with:
+          path: ${{env.BOOST_ROOT}}
+          key: boost_1_83_0-msvc-14.3-64
+
       - name: Install Boost
+        if: steps.restore-boost.outputs.cache-hit != 'true'
         shell: powershell
         run: |
-          echo "${env:BOOST_ROOT}"
-          $Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
+          $Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
           (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
           Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"
 
@@ -34,7 +41,7 @@ jobs:
           $release_name = "ccx-cli-win64-v$ccx_version"
           mkdir "$build_folder"
           cd "$build_folder"
-          cmake -G "Visual Studio 16 2019" ..
+          cmake -G "Visual Studio 17 2022" ..
           msbuild concealX.sln /p:Configuration=Release /m
           cd src\Release
           Compress-Archive -Path *.exe -DestinationPath "$release_name.zip"

diff --git a/.gitignore b/.gitignore
@@ -23,5 +23,4 @@ compile_commands.json
 *.ipch
 *.bin
 *.json
-*.json
-*.json
+cmake-build*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 include(CheckCXXCompilerFlag)
-set(VERSION "6.7.2")
+set(VERSION "6.7.3")
 set(VERSION_BUILD_NO "Trebopala")
 # Packaged from main commits
 set(COMMIT 1db6e66)

diff --git a/docs/build_docs.bash b/docs/build_docs.bash
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+input_folder=""
+output_folder=""
+
+display_help() {
+    echo "Usage: $0 [OPTIONS]"
+    echo "Options:"
+    echo "  -i, --input INPUT_FOLDER  Specify the input folder (default: rpc/openapi)"
+    echo "  -o, --output OUTPUT_FOLDER Specify the output folder (default: rpc)"
+    echo "  -h, --help                Display this help message"
+    exit 0
+}
+
+if [ $# -ne 4 ]; then
+    display_help
+fi
+
+# Parse command-line arguments
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        -i)
+            input_folder="$2"
+            shift
+            shift
+            ;;
+        -o)
+            output_folder="$2"
+            shift
+            shift
+            ;;
+        *)
+            display_help
+            ;;
+    esac
+done
+
+if [ -z "$input_folder" ] || [ -z "$output_folder" ]; then
+    display_help
+fi
+
+if [ ! -d "$input_folder" ]; then
+    echo "Input folder '$input_folder' does not exist."
+    exit 1
+fi
+
+mkdir -p "$output_folder"
+
+for yaml_file in "$input_folder"/*.yaml; do
+    if [[ -f "$yaml_file" ]]; then
+        filename=$(basename "$yaml_file" .yaml)
+        redocly build-docs "$yaml_file" -o "$output_folder/$filename.html"
+    fi
+done