devstar/webTerminal
14
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
jiaojm
2026-01-07 18:37:59 +08:00
parent 92b7d50817
commit 91ca461202
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/backend.yml vendored
View File

@@ -32,8 +32,3 @@ jobs:
env: env:
BUILD_TARGET: ${{ matrix.target }} BUILD_TARGET: ${{ matrix.target }}
run: ./scripts/cross-build.sh run: ./scripts/cross-build.sh
- uses: actions/upload-artifact@v4
with:
name: ttyd.${{ matrix.target }}
path: build/ttyd*

13
.github/workflows/docker.yml vendored
View File

@@ -38,16 +38,21 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Determine docker tags - name: Determine docker tags
id: docker_tag id: docker_tag
env:
DOCKER_USER: ${{ vars.DOCKER_HUB_USERNAME }}
PROJECT: ${{ vars.PROJECT_NAME }}
run: | run: |
FULL_IMAGE_NAME="${DOCKER_USER}/${PROJECT}"
case $GITHUB_REF in case $GITHUB_REF in
refs/tags/*) refs/tags/*)
TAG_NAME=${GITHUB_REF#refs/tags/} TAG_NAME=${GITHUB_REF#refs/tags/}
echo "DOCKER_TAG=tsl0922/ttyd:${TAG_NAME}" >> $GITHUB_ENV echo "DOCKER_TAG=${FULL_IMAGE_NAME}:${TAG_NAME}" >> $GITHUB_ENV
echo "ALPINE_TAG=tsl0922/ttyd:${TAG_NAME}-alpine" >> $GITHUB_ENV echo "ALPINE_TAG=${FULL_IMAGE_NAME}:${TAG_NAME}-alpine" >> $GITHUB_ENV
;; ;;
*) *)
echo "DOCKER_TAG=tsl0922/ttyd:latest" >> $GITHUB_ENV echo "DOCKER_TAG=${FULL_IMAGE_NAME}:latest" >> $GITHUB_ENV
echo "ALPINE_TAG=tsl0922/ttyd:alpine" >> $GITHUB_ENV echo "ALPINE_TAG=${FULL_IMAGE_NAME}:alpine" >> $GITHUB_ENV
esac esac
- name: build/push docker image - name: build/push docker image
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6

10
scripts/cross-build.sh
View File

@@ -18,7 +18,7 @@ LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.3.3}"
build_zlib() { build_zlib() {
echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..." echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..."
curl -fSsLo- "https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}" curl -fSsLo- "https://mirror.ghproxy.com/https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
pushd "${BUILD_DIR}"/zlib-"${ZLIB_VERSION}" pushd "${BUILD_DIR}"/zlib-"${ZLIB_VERSION}"
env CHOST="${TARGET}" ./configure --static --archs="-fPIC" --prefix="${STAGE_DIR}" env CHOST="${TARGET}" ./configure --static --archs="-fPIC" --prefix="${STAGE_DIR}"
make -j"$(nproc)" install make -j"$(nproc)" install
@@ -43,9 +43,7 @@ build_json-c() {
build_mbedtls() { build_mbedtls() {
echo "=== Building mbedtls-${MBEDTLS_VERSION} (${TARGET})..." echo "=== Building mbedtls-${MBEDTLS_VERSION} (${TARGET})..."
curl -fSsLo- "https://github.com/ARMmbed/mbedtls/archive/v${MBEDTLS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}" curl -fSsLo- "https://mirror.ghproxy.com/https://github.com/ARMmbed/mbedtls/archive/v${MBEDTLS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
pushd "${BUILD_DIR}/mbedtls-${MBEDTLS_VERSION}"
rm -rf build && mkdir -p build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \ cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \
-DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX="${STAGE_DIR}" \ -DCMAKE_INSTALL_PREFIX="${STAGE_DIR}" \
@@ -83,7 +81,7 @@ EOF
build_libwebsockets() { build_libwebsockets() {
echo "=== Building libwebsockets-${LIBWEBSOCKETS_VERSION} (${TARGET})..." echo "=== Building libwebsockets-${LIBWEBSOCKETS_VERSION} (${TARGET})..."
curl -fSsLo- "https://github.com/warmcat/libwebsockets/archive/v${LIBWEBSOCKETS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}" curl -fSsLo- "https://mirror.ghproxy.com/https://github.com/warmcat/libwebsockets/archive/v${LIBWEBSOCKETS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
pushd "${BUILD_DIR}/libwebsockets-${LIBWEBSOCKETS_VERSION}" pushd "${BUILD_DIR}/libwebsockets-${LIBWEBSOCKETS_VERSION}"
sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in
sed -i 's/ OR PC_OPENSSL_FOUND//g' lib/tls/CMakeLists.txt sed -i 's/ OR PC_OPENSSL_FOUND//g' lib/tls/CMakeLists.txt
@@ -134,7 +132,7 @@ build() {
ALIAS="$2" ALIAS="$2"
STAGE_DIR="${STAGE_ROOT}/${TARGET}" STAGE_DIR="${STAGE_ROOT}/${TARGET}"
BUILD_DIR="${BUILD_ROOT}/${TARGET}" BUILD_DIR="${BUILD_ROOT}/${TARGET}"
MUSL_CC_URL="https://github.com/tsl0922/musl-toolchains/releases/download/2021-11-23" MUSL_CC_URL="https://mirror.ghproxy.com/https://github.com/tsl0922/musl-toolchains/releases/download/2021-11-23"
COMPONENTS="1" COMPONENTS="1"
SYSTEM="Linux" SYSTEM="Linux"