fix: 简化 Docker 登录条件判断,移除冗余的 skipped 状态检测

- Docker 登录步骤移除对 'skipped' 状态的判断,仅保留 'not-found' 检测
- 统一所有字符串引号风格从单引号改为双引号,保持代码风格一致
This commit is contained in:
Lyda
2026-03-31 19:01:56 +08:00
parent 2069d7e1e9
commit e8f2faaec4
+26 -26
View File
@@ -1,58 +1,58 @@
name: 'Configure Build Environment' name: "Configure Build Environment"
description: '验证已有环境并配置 Git 与 kubectl(不执行软件安装)' description: "验证已有环境并配置 Git 与 kubectl(不执行软件安装)"
author: 'Your Organization' author: "Your Organization"
branding: branding:
icon: 'settings' icon: "settings"
color: 'green' color: "green"
inputs: inputs:
git-user-name: git-user-name:
description: 'Git 用户名' description: "Git 用户名"
required: false required: false
default: 'GiteaActions' default: "GiteaActions"
git-user-email: git-user-email:
description: 'Git 用户邮箱' description: "Git 用户邮箱"
required: false required: false
default: 'xgj-actions@xmail.bjxgj.com' default: "xgj-actions@xmail.bjxgj.com"
kube-config: kube-config:
description: 'Base64 编码的 kubectl 配置文件' description: "Base64 编码的 kubectl 配置文件"
required: false required: false
default: '' default: ""
enable-validation: enable-validation:
description: '是否执行环境校验 (true/false)' description: "是否执行环境校验 (true/false)"
required: false required: false
default: 'false' default: "false"
docker-registry: docker-registry:
description: 'Docker 私有仓库地址' description: "Docker 私有仓库地址"
required: false required: false
default: 'docker-registry.bjxgj.com' default: "docker-registry.bjxgj.com"
docker-username: docker-username:
description: 'Docker 仓库用户名' description: "Docker 仓库用户名"
required: false required: false
default: 'GiteaDocker' default: "GiteaDocker"
docker-password: docker-password:
description: 'Docker 仓库密码(开启登录时必填)' description: "Docker 仓库密码(开启登录时必填)"
required: false required: false
default: '' default: ""
skip-docker-login: skip-docker-login:
description: '是否跳过 Docker 登录 (true/false)' description: "是否跳过 Docker 登录 (true/false)"
required: false required: false
default: 'false' default: "false"
outputs: outputs:
docker-version: docker-version:
description: '检测到的 Docker 版本' description: "检测到的 Docker 版本"
value: ${{ steps.validate-tools.outputs.docker-version }} value: ${{ steps.validate-tools.outputs.docker-version }}
kubectl-version: kubectl-version:
description: '检测到的 kubectl 版本' description: "检测到的 kubectl 版本"
value: ${{ steps.validate-tools.outputs.kubectl-version }} value: ${{ steps.validate-tools.outputs.kubectl-version }}
kubectl-context: kubectl-context:
description: '验证通过时的当前 kubectl 上下文' description: "验证通过时的当前 kubectl 上下文"
value: ${{ steps.verify-kubectl.outputs.current-context }} value: ${{ steps.verify-kubectl.outputs.current-context }}
runs: runs:
using: 'composite' using: "composite"
steps: steps:
- name: 配置 Git - name: 配置 Git
shell: bash shell: bash
@@ -82,7 +82,7 @@ runs:
run: bash ${{ github.action_path }}/scripts/verify-kubectl.sh run: bash ${{ github.action_path }}/scripts/verify-kubectl.sh
- name: 登录私有 Docker 仓库 - 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 uses: docker/login-action@v3
with: with:
registry: ${{ inputs.docker-registry }} registry: ${{ inputs.docker-registry }}