From 3ea867e4b83f5b354e5e9e86c48f421df4782c4b Mon Sep 17 00:00:00 2001 From: asdlokj1qpi23 Date: Tue, 25 Mar 2025 15:02:07 +0800 Subject: [PATCH] fix actions error --- .github/workflows/build.yml | 6 ++++-- .github/workflows/docker.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32dbd96..d07c5a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,15 +24,17 @@ jobs: os: ubuntu-latest - arch: armv7 artifact: subconverter_armv7 - os: [self-hosted, linux, ARM] + os: ubuntu-latest - arch: aarch64 artifact: subconverter_aarch64 - os: [self-hosted, linux, ARM64] + os: ubuntu-latest runs-on: ${{ matrix.os }} name: Linux ${{ matrix.arch }} Build steps: - name: Checkout base uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Add commit id into version if: ${{ !startsWith(github.ref, 'refs/tags/') }} run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2a72bd8..d5a19b8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,9 +22,9 @@ jobs: - platform: linux/386 os: ubuntu-latest - platform: linux/arm/v7 - os: [self-hosted, linux, ARM] + os: ubuntu-latest - platform: linux/arm64 - os: [self-hosted, linux, ARM64] + os: ubuntu-latest runs-on: ${{ matrix.os }} name: Build ${{ matrix.platform }} Image steps: @@ -37,6 +37,8 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3