From e8f2faaec43855a25f4b738af4d710cd7d27d499 Mon Sep 17 00:00:00 2001
From: Lyda <1829913225@qq.com>
Date: Tue, 31 Mar 2026 19:01:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AE=80=E5=8C=96=20Docker=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E7=9A=84=20skipped=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Docker 登录步骤移除对 'skipped' 状态的判断，仅保留 'not-found' 检测
- 统一所有字符串引号风格从单引号改为双引号，保持代码风格一致
---
 config-env/action.yml | 52 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/config-env/action.yml b/config-env/action.yml
index e3ad733..a61774c 100644
--- a/config-env/action.yml
+++ b/config-env/action.yml
@@ -1,58 +1,58 @@
-name: 'Configure Build Environment'
-description: '验证已有环境并配置 Git 与 kubectl（不执行软件安装）'
-author: 'Your Organization'
+name: "Configure Build Environment"
+description: "验证已有环境并配置 Git 与 kubectl（不执行软件安装）"
+author: "Your Organization"
 
 branding:
-  icon: 'settings'
-  color: 'green'
+  icon: "settings"
+  color: "green"
 
 inputs:
   git-user-name:
-    description: 'Git 用户名'
+    description: "Git 用户名"
     required: false
-    default: 'GiteaActions'
+    default: "GiteaActions"
   git-user-email:
-    description: 'Git 用户邮箱'
+    description: "Git 用户邮箱"
     required: false
-    default: 'xgj-actions@xmail.bjxgj.com'
+    default: "xgj-actions@xmail.bjxgj.com"
   kube-config:
-    description: 'Base64 编码的 kubectl 配置文件'
+    description: "Base64 编码的 kubectl 配置文件"
     required: false
-    default: ''
+    default: ""
   enable-validation:
-    description: '是否执行环境校验 (true/false)'
+    description: "是否执行环境校验 (true/false)"
     required: false
-    default: 'false'
+    default: "false"
   docker-registry:
-    description: 'Docker 私有仓库地址'
+    description: "Docker 私有仓库地址"
     required: false
-    default: 'docker-registry.bjxgj.com'
+    default: "docker-registry.bjxgj.com"
   docker-username:
-    description: 'Docker 仓库用户名'
+    description: "Docker 仓库用户名"
     required: false
-    default: 'GiteaDocker'
+    default: "GiteaDocker"
   docker-password:
-    description: 'Docker 仓库密码（开启登录时必填）'
+    description: "Docker 仓库密码（开启登录时必填）"
     required: false
-    default: ''
+    default: ""
   skip-docker-login:
-    description: '是否跳过 Docker 登录 (true/false)'
+    description: "是否跳过 Docker 登录 (true/false)"
     required: false
-    default: 'false'
+    default: "false"
 
 outputs:
   docker-version:
-    description: '检测到的 Docker 版本'
+    description: "检测到的 Docker 版本"
     value: ${{ steps.validate-tools.outputs.docker-version }}
   kubectl-version:
-    description: '检测到的 kubectl 版本'
+    description: "检测到的 kubectl 版本"
     value: ${{ steps.validate-tools.outputs.kubectl-version }}
   kubectl-context:
-    description: '验证通过时的当前 kubectl 上下文'
+    description: "验证通过时的当前 kubectl 上下文"
     value: ${{ steps.verify-kubectl.outputs.current-context }}
 
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     - name: 配置 Git
       shell: bash
@@ -82,7 +82,7 @@ runs:
       run: bash ${{ github.action_path }}/scripts/verify-kubectl.sh
 
     - name: 登录私有 Docker 仓库
-      if: ${{ inputs.skip-docker-login != 'true' && steps.validate-tools.outputs.docker-version != 'not-found' && steps.validate-tools.outputs.docker-version != 'skipped' }}
+      if: ${{ inputs.skip-docker-login != 'true' && steps.validate-tools.outputs.docker-version != 'not-found' }}
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.docker-registry }}