From 5195d74ff1501dc3061616e494d8afdf0de74afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?= Date: Sat, 12 Oct 2024 17:43:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=9A=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=8E=AF=E5=A2=83=E5=92=8C=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-build-push.yml | 8 ++++++-- .github/workflows/setup-node-environment.yml | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index a6f1680..d483688 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -12,7 +12,11 @@ env: jobs: job: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-15] # https://docs.github.com/zh/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#用于公共存储库的-github-托管的标准运行器 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@main - uses: yanhao98/semantic-release-action@main @@ -38,7 +42,7 @@ jobs: with: build_file: ./Dockerfile.test build_platforms: linux/amd64,linux/arm64 - build_push: true + build_push: ${{ matrix.os == 'ubuntu-latest' }} build_load: false metadata_images: | docker.io/${{ vars.DOCKERHUB_USERNAME }}/docker-example diff --git a/.github/workflows/setup-node-environment.yml b/.github/workflows/setup-node-environment.yml index 985fb21..3cae5ae 100644 --- a/.github/workflows/setup-node-environment.yml +++ b/.github/workflows/setup-node-environment.yml @@ -16,8 +16,7 @@ jobs: fail-fast: false matrix: container-image: ["", "yanhao98/runner-images:pnpm"] - os: [ubuntu-latest, macos-15] # https://docs.github.com/zh/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#用于公共存储库的-github-托管的标准运行器 - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest container: image: ${{ matrix.container-image }} steps: