🎉 0.3.3

XDSEC · Jan 22, 2025 · 946f9d1 · 946f9d1
1 parent 3a425b6
commit 946f9d1
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 58 deletions.
diff --git a/.github/workflows/cli.yaml b/.github/workflows/cli.yaml
@@ -1,3 +1,4 @@
+---
 #-------------------------------------------------------------------------------
 # Workflow configuration
 #-------------------------------------------------------------------------------
@@ -13,7 +14,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.3.2"
+  APP_VERSION: "0.3.3"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs
@@ -30,11 +31,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      
+
       # Install musl-gcc
       - name: Install musl-gcc
         run: sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install musl-tools musl-dev -y
-      
+
       # Setup Rust
       - uses: actions-rs/toolchain@v1
         with:
@@ -89,7 +90,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      
+
       # Setup Rust
       - uses: actions-rs/toolchain@v1
         with:
@@ -126,15 +127,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      
+
       # Setup Rust
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
       - name: Install NASM for aws-lc-rs on Windows
         uses: ilammy/setup-nasm@v1
-  
+
       - name: Install ninja-build tool for aws-lc-fips-sys on Windows
         uses: seanmiddleditch/gha-setup-ninja@v5
 

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
@@ -1,3 +1,4 @@
+---
 #-------------------------------------------------------------------------------
 # Workflow configuration
 #-------------------------------------------------------------------------------
@@ -6,9 +7,9 @@ name: "Desktop CI builds (cmake)"
 on:
   push:
     paths-ignore:
-      - '**/README.md'
+      - "**/README.md"
     branches:
-      - 'master'
+      - "master"
   pull_request:
   workflow_dispatch:
 
@@ -18,7 +19,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.3.2"
+  APP_VERSION: "0.3.3"
   QT_VERSION: "6.8.1"
 
 #-------------------------------------------------------------------------------
@@ -46,25 +47,25 @@ jobs:
       # Install dependencies (from package manager)
       - name: Install dependencies (from package manager)
         run: |
-             sudo apt-get install libgl1-mesa-dev libxcb1-dev libxkbcommon-x11-dev libx11-xcb-dev libxcb-cursor0 libzstd-dev fuse libfuse-dev libwayland-dev -y;
-             sudo apt-get install cmake ninja-build pkgconf libtool -y;
-             sudo apt-get install appstream -y;
+          sudo apt-get install libgl1-mesa-dev libxcb1-dev libxkbcommon-x11-dev libx11-xcb-dev libxcb-cursor0 libzstd-dev fuse libfuse-dev libwayland-dev -y;
+          sudo apt-get install cmake ninja-build pkgconf libtool -y;
+          sudo apt-get install appstream -y;
 
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             cmake -B build/ -G Ninja -DCMAKE_BUILD_TYPE=Release -G Ninja
-             cmake --build build/ --config Release
+          cmake -B build/ -G Ninja -DCMAKE_BUILD_TYPE=Release -G Ninja
+          cmake --build build/ --config Release
 
       # Deploy application
       - name: Deploy application
         run: ./deploy_linux.sh -c -i -p
-      
+
       # Upload AppImage
       - name: Upload AppImage
         uses: actions/upload-artifact@v4
@@ -97,14 +98,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=x86_64
-             cmake --build build/ --config Release --target all
+          export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
+          cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=x86_64
+          cmake --build build/ --config Release --target all
 
       # Deploy application
       - name: Deploy application
@@ -141,14 +142,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=arm64
-             cmake --build build/ --config Release --target all
+          export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
+          cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=arm64
+          cmake --build build/ --config Release --target all
 
       # Deploy application
       - name: Deploy application
@@ -180,10 +181,10 @@ jobs:
 
       - name: Install NASM for aws-lc-rs on Windows
         uses: ilammy/setup-nasm@v1
-    
+
       - name: Install ninja-build tool for aws-lc-fips-sys on Windows
         uses: seanmiddleditch/gha-setup-ninja@v5
-    
+
       # Install Qt
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
@@ -200,14 +201,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             mkdir build && cd build/
-             cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
-             nmake
+          mkdir build && cd build/
+          cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
+          nmake
 
       # Deploy application
       - name: Deploy application

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,3 +1,4 @@
+---
 #-------------------------------------------------------------------------------
 # Workflow configuration
 #-------------------------------------------------------------------------------
@@ -13,7 +14,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.3.2"
+  APP_VERSION: "0.3.3"
   QT_VERSION: "6.8.1"
 
 #-------------------------------------------------------------------------------
@@ -41,25 +42,25 @@ jobs:
       # Install dependencies (from package manager)
       - name: Install dependencies (from package manager)
         run: |
-             sudo apt-get install libgl1-mesa-dev libxcb1-dev libxkbcommon-x11-dev libx11-xcb-dev libxcb-cursor0 libzstd-dev fuse libfuse-dev libwayland-dev -y;
-             sudo apt-get install cmake ninja-build pkgconf libtool -y;
-             sudo apt-get install appstream -y;
+          sudo apt-get install libgl1-mesa-dev libxcb1-dev libxkbcommon-x11-dev libx11-xcb-dev libxcb-cursor0 libzstd-dev fuse libfuse-dev libwayland-dev -y;
+          sudo apt-get install cmake ninja-build pkgconf libtool -y;
+          sudo apt-get install appstream -y;
 
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             cmake -B build/ -G Ninja -DCMAKE_BUILD_TYPE=Release -G Ninja
-             cmake --build build/ --config Release
+          cmake -B build/ -G Ninja -DCMAKE_BUILD_TYPE=Release -G Ninja
+          cmake --build build/ --config Release
 
       # Deploy application
       - name: Deploy application
         run: ./deploy_linux.sh -c -i -p
-      
+
       # Upload AppImage
       - name: Upload AppImage
         uses: actions/upload-artifact@v4
@@ -98,14 +99,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=x86_64
-             cmake --build build/ --config Release --target all
+          export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
+          cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=x86_64
+          cmake --build build/ --config Release --target all
 
       # Deploy application
       - name: Deploy application
@@ -150,14 +151,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=arm64
-             cmake --build build/ --config Release --target all
+          export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
+          cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_ARCHITECTURES=arm64
+          cmake --build build/ --config Release --target all
 
       # Deploy application
       - name: Deploy application
@@ -197,10 +198,10 @@ jobs:
 
       - name: Install NASM for aws-lc-rs on Windows
         uses: ilammy/setup-nasm@v1
-  
+
       - name: Install ninja-build tool for aws-lc-fips-sys on Windows
         uses: seanmiddleditch/gha-setup-ninja@v5
-  
+
       # Install Qt
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
@@ -217,14 +218,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             cmake --version
+          cmake --version
 
       # Build application
       - name: Build application
         run: |
-             mkdir build && cd build/
-             cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
-             nmake
+          mkdir build && cd build/
+          cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
+          nmake
 
       # Deploy application
       - name: Deploy application

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 3)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 
 execute_process(
   COMMAND git describe --always --dirty

diff --git a/deploy_linux.sh b/deploy_linux.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.3.2
+export APP_VERSION=0.3.3
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Linux x86_64) [v$APP_VERSION]"

diff --git a/deploy_macos.sh b/deploy_macos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.3.2
+export APP_VERSION=0.3.3
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 arch=x86_64

diff --git a/deploy_windows.sh b/deploy_windows.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.3.2
+export APP_VERSION=0.3.3
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Windows x86_64) [v$APP_VERSION]"

diff --git a/windows/setup.nsi b/windows/setup.nsi
@@ -11,7 +11,7 @@ Unicode True
 !define DESCRIPTION                  "Controlled TCP-over-WebSocket forwarding tunnel."
 !define VERSIONMAJOR                 0
 !define VERSIONMINOR                 3
-!define VERSIONBUILD                 2
+!define VERSIONBUILD                 3
 !define INSTALL_DIR_DEFAULT          "$PROGRAMFILES64\${APPNAME}"
 !define MUI_ABORTWARNING
 !define MUI_FINISHPAGE_RUN

diff --git a/wsrx/Cargo.toml b/wsrx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wsrx"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 authors = ["Reverier-Xu <[email protected]>"]
 description = "Controlled TCP-over-WebSocket forwarding tunnel."