From 91ca46120251295db0b47592f5cca804232321ba Mon Sep 17 00:00:00 2001 From: jiaojm <13763605353@163.com> Date: Wed, 7 Jan 2026 18:37:59 +0800 Subject: [PATCH] fix --- .github/workflows/backend.yml | 5 ----- .github/workflows/docker.yml | 13 +++++++++---- scripts/cross-build.sh | 10 ++++------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 0ee6e39..a667f1b 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -32,8 +32,3 @@ jobs: env: BUILD_TARGET: ${{ matrix.target }} run: ./scripts/cross-build.sh - - uses: actions/upload-artifact@v4 - with: - name: ttyd.${{ matrix.target }} - path: build/ttyd* - diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 65db4f2..74aca40 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -38,16 +38,21 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Determine docker tags id: docker_tag + env: + DOCKER_USER: ${{ vars.DOCKER_HUB_USERNAME }} + PROJECT: ${{ vars.PROJECT_NAME }} run: | + FULL_IMAGE_NAME="${DOCKER_USER}/${PROJECT}" + case $GITHUB_REF in refs/tags/*) TAG_NAME=${GITHUB_REF#refs/tags/} - echo "DOCKER_TAG=tsl0922/ttyd:${TAG_NAME}" >> $GITHUB_ENV - echo "ALPINE_TAG=tsl0922/ttyd:${TAG_NAME}-alpine" >> $GITHUB_ENV + echo "DOCKER_TAG=${FULL_IMAGE_NAME}:${TAG_NAME}" >> $GITHUB_ENV + echo "ALPINE_TAG=${FULL_IMAGE_NAME}:${TAG_NAME}-alpine" >> $GITHUB_ENV ;; *) - echo "DOCKER_TAG=tsl0922/ttyd:latest" >> $GITHUB_ENV - echo "ALPINE_TAG=tsl0922/ttyd:alpine" >> $GITHUB_ENV + echo "DOCKER_TAG=${FULL_IMAGE_NAME}:latest" >> $GITHUB_ENV + echo "ALPINE_TAG=${FULL_IMAGE_NAME}:alpine" >> $GITHUB_ENV esac - name: build/push docker image uses: docker/build-push-action@v6 diff --git a/scripts/cross-build.sh b/scripts/cross-build.sh index 8c350c5..bb0cce0 100755 --- a/scripts/cross-build.sh +++ b/scripts/cross-build.sh @@ -18,7 +18,7 @@ LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.3.3}" build_zlib() { 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}" env CHOST="${TARGET}" ./configure --static --archs="-fPIC" --prefix="${STAGE_DIR}" make -j"$(nproc)" install @@ -43,9 +43,7 @@ build_json-c() { build_mbedtls() { echo "=== Building mbedtls-${MBEDTLS_VERSION} (${TARGET})..." - curl -fSsLo- "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 + curl -fSsLo- "https://mirror.ghproxy.com/https://github.com/ARMmbed/mbedtls/archive/v${MBEDTLS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}" cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_INSTALL_PREFIX="${STAGE_DIR}" \ @@ -83,7 +81,7 @@ EOF build_libwebsockets() { 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}" sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in sed -i 's/ OR PC_OPENSSL_FOUND//g' lib/tls/CMakeLists.txt @@ -134,7 +132,7 @@ build() { ALIAS="$2" STAGE_DIR="${STAGE_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" SYSTEM="Linux"