From 03a23f6f31fed1b56c174f38f5bee979b4721e92 Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 19 Apr 2025 14:36:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20workflow=20=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_docker_image.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index cc652e74..03a4a607 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -89,9 +89,7 @@ jobs: build: needs: build-static - # 由于 ubuntu-latest 中使用 linux6.x 内核 linux/s390x npm 无法使用 - runs-on: ubuntu-20.04 - # runs-on: self-hosted + runs-on: ubuntu-22.04 permissions: packages: write @@ -160,8 +158,8 @@ jobs: QL_BRANCH=${{ github.ref_name }} SOURCE_COMMIT=${{ github.sha }} network: host - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386 - # platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386 + # linux/s390x npm 暂不可用 + platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386 context: . file: ./docker/Dockerfile push: true @@ -173,12 +171,12 @@ jobs: - name: Image digest run: | echo ${{ steps.docker_build.outputs.digest }} - + build310: if: ${{ github.ref_name == 'master' }} needs: build-static - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: packages: write @@ -226,7 +224,8 @@ jobs: QL_BRANCH=${{ github.ref_name }} SOURCE_COMMIT=${{ github.sha }} network: host - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386 + # linux/s390x npm 暂不可用 + platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386 context: . file: ./docker/310.Dockerfile push: true