From a8cae7558af64fe9f5179707870119fa8cb57e2e Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Wed, 18 Jan 2023 10:52:35 +0800 Subject: [PATCH] Bump to 1.7.3 --- .github/workflows/release.yml | 23 +++++++++++++++++++---- CMakeLists.txt | 4 ++-- README.md | 7 ------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d079c48..9500cee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,11 +21,26 @@ jobs: - name: Cross build (${{ matrix.target }}) env: BUILD_TARGET: ${{ matrix.target }} - run: | - ./scripts/cross-build.sh - mv build/ttyd build/ttyd.${{ matrix.target }} + run: ./scripts/cross-build.sh + - uses: actions/upload-artifact@v3 + with: + name: ttyd.${{ matrix.target }} + path: build/ttyd* + publish: + needs: [build] + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + - run: | + mkdir build + for file in ttyd.*/*; do + target=$(echo $file | awk -F/ '{print $1}') + [[ $file == *.exe ]] && target="$target.exe" + mv $file build/$target + done - uses: ncipollo/release-action@v1 with: - artifacts: build/ttyd.${{ matrix.target }} + artifacts: build/* allowUpdates: true draft: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f8bdc..6bacdd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,11 @@ if(${CMAKE_VERSION} VERSION_LESS "3.12.0") project(ttyd C) set(PROJECT_VERSION_MAJOR "1") set(PROJECT_VERSION_MINOR "7") - set(PROJECT_VERSION_PATCH "2") + set(PROJECT_VERSION_PATCH "3") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") else() cmake_policy(SET CMP0048 NEW) - project(ttyd VERSION 1.7.2 LANGUAGES C) + project(ttyd VERSION 1.7.3 LANGUAGES C) endif() find_package(Git) diff --git a/README.md b/README.md index 8701a54..3ac3a4b 100644 --- a/README.md +++ b/README.md @@ -53,14 +53,9 @@ ttyd is a simple command-line tool for sharing terminal over the web. ## Command-line Options ``` -ttyd is a tool for sharing terminal over the web - USAGE: ttyd [options] [] -VERSION: - 1.7.2 - OPTIONS: -p, --port Port to listen (default: 7681, use `0` for random port) -i, --interface Network interface to bind (eg: eth0), or UNIX domain socket path (eg: /var/run/ttyd.sock) @@ -87,8 +82,6 @@ OPTIONS: -d, --debug Set log level (default: 7) -v, --version Print the version and exit -h, --help Print this text and exit - -Visit https://github.com/tsl0922/ttyd to get more information and report bugs. ``` Read the example usage on the [wiki](https://github.com/tsl0922/ttyd/wiki/Example-Usage). -- 2.43.4