From 981fa299461b93f5dd1445b2509fa2b25cb85212 Mon Sep 17 00:00:00 2001 From: zzw <1464003642@qq.com> Date: Mon, 31 Aug 2026 11:39:07 +0800 Subject: [PATCH] fix: ci merge test --- .gitea/workflows/ci.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 95f19da..22bc6b5 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -72,8 +72,14 @@ jobs: else matrix="$matrix," fi - matrix="$matrix{\"name\":\"$svc\",\"dockerfile\":\"$df\",\"build\":\"$build\"}" - echo "$svc=$build" + # use yes/no to avoid true/false being coerced to boolean in matrix if + if [ "$build" = true ]; then + flag=yes + else + flag=no + fi + matrix="$matrix{\"name\":\"$svc\",\"dockerfile\":\"$df\",\"build\":\"$flag\"}" + echo "$svc=$flag" done matrix="$matrix]" @@ -92,25 +98,25 @@ jobs: NAME: lone/${{ matrix.name }} steps: - name: Skip - if: matrix.build != 'true' + if: matrix.build != 'yes' run: echo "skip ${{ matrix.name }} (no changes)" - name: Checkout - if: matrix.build == 'true' + if: matrix.build == 'yes' uses: https://git.ailuowan.com/deploy/checkout@v4 - name: Login Registry - if: matrix.build == 'true' + if: matrix.build == 'yes' run: | echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ vars.REGISTRY }} -u "${{ vars.REGISTRY_USERNAME }}" --password-stdin - name: Docker build - if: matrix.build == 'true' + if: matrix.build == 'yes' run: | docker buildx use default docker buildx build --builder default --load -f "${{ matrix.dockerfile }}" -t "${{ vars.REGISTRY }}/$NAME:latest" . - name: Docker push - if: matrix.build == 'true' + if: matrix.build == 'yes' run: | docker push ${{ vars.REGISTRY }}/$NAME:latest