Skip to content

Commit

Permalink
🐛 fix aws-lc windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
Reverier-Xu committed Jul 29, 2024
1 parent c822ce0 commit ec11b3f
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 8 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

env:
APP_NAME: "WebSocketReflectorX"
APP_VERSION: "0.2.20"
APP_VERSION: "0.2.21"

#-------------------------------------------------------------------------------
# Workflow jobs
Expand Down Expand Up @@ -169,6 +169,12 @@ jobs:
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

# Build application
- name: Build application
run: cargo build --release --features=binary
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

env:
APP_NAME: "WebSocketReflectorX"
APP_VERSION: "0.2.20"
APP_VERSION: "0.2.21"
QT_VERSION: "6.7.1"

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -194,6 +194,12 @@ jobs:
arch: x64
spectre: true

- 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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

env:
APP_NAME: "WebSocketReflectorX"
APP_VERSION: "0.2.20"
APP_VERSION: "0.2.21"
QT_VERSION: "6.7.1"

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -195,6 +195,12 @@ jobs:
arch: x64
spectre: true

- 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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)

set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
set(VERSION_PATCH 20)
set(VERSION_PATCH 21)

execute_process(
COMMAND git describe --always --dirty
Expand Down
2 changes: 1 addition & 1 deletion deploy_linux.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

export APP_NAME="WebSocketReflectorX"
export APP_VERSION=0.2.20
export APP_VERSION=0.2.21
export GIT_VERSION=$(git rev-parse --short HEAD)

echo "> $APP_NAME packager (Linux x86_64) [v$APP_VERSION]"
Expand Down
2 changes: 1 addition & 1 deletion deploy_macos.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

export APP_NAME="WebSocketReflectorX"
export APP_VERSION=0.2.20
export APP_VERSION=0.2.21
export GIT_VERSION=$(git rev-parse --short HEAD)

echo "> $APP_NAME packager (macOS x86_64) [v$APP_VERSION]"
Expand Down
2 changes: 1 addition & 1 deletion deploy_windows.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

export APP_NAME="WebSocketReflectorX"
export APP_VERSION=0.2.20
export APP_VERSION=0.2.21
export GIT_VERSION=$(git rev-parse --short HEAD)

echo "> $APP_NAME packager (Windows x86_64) [v$APP_VERSION]"
Expand Down
2 changes: 1 addition & 1 deletion wsrx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wsrx"
version = "0.2.20"
version = "0.2.21"
edition = "2021"
authors = ["Reverier-Xu <reverier.xu@xdsec.club>"]
description = "Controlled TCP-over-WebSocket forwarding tunnel."
Expand Down

0 comments on commit ec11b3f

Please sign in to comment.