refactor: 移除 docker-build-push 工作流中的测试 vars 步骤

feat: 更新 docker-build-push 工作流中的测试步骤以使用 vars 代替 secrets
feat: 在 docker-build-push 工作流中为测试步骤指定 bash shell
2025-07-13 23:00:48 +08:00 · 2024-10-15 23:07:09 +08:00 · 2024-10-15 23:03:48 +08:00 · 2024-10-15 23:00:32 +08:00 · 2024-10-15 22:58:19 +08:00 · 2024-10-14 10:59:23 +08:00
10 changed files with 212 additions and 28 deletions
--- a/.github/workflows/deploy-dist-to-surge.yml
+++ b/.github/workflows/deploy-dist-to-surge.yml
@ -1,7 +1,9 @@
 on:
  pull_request:
    paths:
      - "deploy-dist-to-surge.yml/**"
      - ".github/workflows/deploy-dist-to-surge.yml"
  push:
    branches:
      - main
    paths:
      - "deploy-dist-to-surge.yml/**"
      - ".github/workflows/deploy-dist-to-surge.yml"
@ -15,10 +17,10 @@ jobs:
      - name: 准备部署文件
        run: |
          mkdir dist
-          echo "<h1>Hello, World!</h1>" > dist/index.html
+          html="<!DOCTYPE html><html><body><h1>${{ github.event_name }}: ${{ github.sha }}</h1></body></html>"
-      - uses: yanhao98/composite-actions/deploy-dist-to-surge.yml@main
+          echo $html > dist/index.html
      - uses: yanhao98/composite-actions/deploy-dist-to-surge@main
        id: surge_deploy
      - name: Check Surge URL
        run: |
-          set -x
+          echo "steps.surge_deploy.outputs.url: ${{ steps.surge_deploy.outputs.url }}"
          echo ${{ steps.surge_deploy.outputs.url }}
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@ -1,7 +1,9 @@
 on:
  pull_request:
    paths:
      - "docker-build-push/**"
      - ".github/workflows/docker-build-push.yml"
  push:
    branches:
      - main
    paths:
      - "docker-build-push/**"
      - ".github/workflows/docker-build-push.yml"
@ -10,6 +12,10 @@ env:
 jobs:
  job:
    # strategy:
    #   fail-fast: false
    #   matrix:
    #     os: [ubuntu-latest, macos-latest] # https://docs.github.com/zh/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#用于公共存储库的-github-托管的标准运行器
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@main
--- a/.github/workflows/setup-node-environment.yml
+++ b/.github/workflows/setup-node-environment.yml
@ -1,7 +1,9 @@
 on:
  pull_request:
    paths:
      - "setup-node-environment/**"
      - ".github/workflows/setup-node-environment.yml"
  push:
    branches:
      - main
    paths:
      - "setup-node-environment/**"
      - ".github/workflows/setup-node-environment.yml"
@ -9,11 +11,64 @@ env:
  TZ: Asia/Shanghai
 jobs:
-  job:
+  job-1:
    strategy:
      fail-fast: false
      matrix:
        container-image: ["", "yanhao98/runner-images:pnpm"]
    runs-on: ubuntu-latest
    container:
      image: ${{ matrix.container-image }}
    steps:
      - name: before
        run: |
          set -x;
          which pnpm || true;
          node -v;
      - uses: yanhao98/composite-actions/setup-node-environment@main
      - name: Check Node and PNPM versions
        run: |
-          set -x
+          set -x;
-          which pnpm
+          which pnpm;
          node -v;
          pnpm node -v;
  _npmrc_no_use_node_version:
    strategy:
      fail-fast: false
      matrix:
        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@main
      - name: before
        run: |
          set -x;
          cat .npmrc;
          sed -i '/use-node-version/d' .npmrc
          node -v;
          cat .npmrc;
      - uses: yanhao98/composite-actions/setup-node-environment@main
      - name: Check Node and PNPM versions
        run: |
          set -x;
          which pnpm;
          node -v;
          pnpm node -v;
  actions_setup_node_v4:
    runs-on: ubuntu-latest
    strategy:
      matrix:
        node-version: [18, 20, 22, lts/*]
    steps:
      - name: "node-version: ${{ matrix.node-version }}"
        uses: actions/setup-node@v4
        with:
          node-version: ${{ matrix.node-version }}
      - run: ls -lha /opt/hostedtoolcache
      - run: ls -lha /opt/hostedtoolcache/node/
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
 node_modules
--- a/.npmrc
+++ b/.npmrc
@ -0,0 +1 @@
 use-node-version=22.9.0 # https://pnpm.io/zh/npmrc#use-node-version
--- a/deploy-dist-to-surge/action.yml
+++ b/deploy-dist-to-surge/action.yml
@ -1,5 +1,5 @@
 name: "Deploy dist to Surge"
-description: ""
+description: "部署 dist 到 Surge"
 outputs:
  url:
    description: "Preview URL"
--- a/package.json
+++ b/package.json
@ -1,3 +1,6 @@
 {
-  "packageManager": "pnpm@9.11.0"
+  "packageManager": "pnpm@9.11.0",
  "dependencies": {
    "bun": "^1.1.30"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -6,4 +6,93 @@ settings:
 importers:
-  .: {}
+  .:
    dependencies:
      bun:
        specifier: ^1.1.30
        version: 1.1.30
 packages:
  '@oven/bun-darwin-aarch64@1.1.30':
    resolution: {integrity: sha512-D07QioP+QXlouvIqQIS+7r2zq4lTNd6he79rhKsRQRZGFf9i3NPu87zspUpCaFEu//DZ35DYTt+5anQpAzpoxA==}
    cpu: [arm64]
    os: [darwin]
  '@oven/bun-darwin-x64-baseline@1.1.30':
    resolution: {integrity: sha512-1kFUCxHx7WuEbLDmqm0m2UKBd3S4Ln6qKQ4gxU4umMLFkmvDJn6PszDruFInxGKFLoTAmbXNYNVWkkG/ekt/Lg==}
    cpu: [x64]
    os: [darwin]
  '@oven/bun-darwin-x64@1.1.30':
    resolution: {integrity: sha512-xZ4gTehS6QwN6bsJfDycCNneKoUMaFUQhQg24bJzXS4JPDxeKg1W7PS5AE+U9apz5Dx6//+D4RwVpAPG2LXt0w==}
    cpu: [x64]
    os: [darwin]
  '@oven/bun-linux-aarch64@1.1.30':
    resolution: {integrity: sha512-SfHHLlph6fptDXyyChcUkeDbEZr2ww1p2BucV6OrvzwTOPi8pVmXA4360YT8ggR/3AHPp4GO36VaD+FU2Ocbxw==}
    cpu: [arm64]
    os: [linux]
  '@oven/bun-linux-x64-baseline@1.1.30':
    resolution: {integrity: sha512-/b/VuNOaAYmsVk9MvfwKcCYARJPUg78hebxNyD5DSajAf3dqtUSnf7QYcq/3mxWH++N+gM7uRTrGksGS63+ZUw==}
    cpu: [x64]
    os: [linux]
  '@oven/bun-linux-x64@1.1.30':
    resolution: {integrity: sha512-1mC39jQSaECytEKAZdCZmv3ZreMsp7aoxnBwmJtVd2Z7urnw17PKi4dKkZd/R+AubsNYtXtW4jeM8SEa5sUJRw==}
    cpu: [x64]
    os: [linux]
  '@oven/bun-windows-x64-baseline@1.1.30':
    resolution: {integrity: sha512-ERQ4/ogzbFvHjpyHcnruc8bnryvDvUoiWi6vczfQ4M/idJc+Kg5VSEJiF5k7946rIZGamG6QWgRxtpIglD4/Zw==}
    cpu: [x64]
    os: [win32]
  '@oven/bun-windows-x64@1.1.30':
    resolution: {integrity: sha512-mdRjNtD9NIA8CiH6N1zrIVE6oAtDko/c29H1s00UA+5O/WhXhg95G8IyInD8hN3vAEz8H2lGBgLG2EGfSFxnGg==}
    cpu: [x64]
    os: [win32]
  bun@1.1.30:
    resolution: {integrity: sha512-ysRL1pq10Xba0jqVLPrKU3YIv0ohfp3cTajCPtpjCyppbn3lfiAVNpGoHfyaxS17OlPmWmR67UZRPw/EueQuug==}
    cpu: [arm64, x64]
    os: [darwin, linux, win32]
    hasBin: true
 snapshots:
  '@oven/bun-darwin-aarch64@1.1.30':
    optional: true
  '@oven/bun-darwin-x64-baseline@1.1.30':
    optional: true
  '@oven/bun-darwin-x64@1.1.30':
    optional: true
  '@oven/bun-linux-aarch64@1.1.30':
    optional: true
  '@oven/bun-linux-x64-baseline@1.1.30':
    optional: true
  '@oven/bun-linux-x64@1.1.30':
    optional: true
  '@oven/bun-windows-x64-baseline@1.1.30':
    optional: true
  '@oven/bun-windows-x64@1.1.30':
    optional: true
  bun@1.1.30:
    optionalDependencies:
      '@oven/bun-darwin-aarch64': 1.1.30
      '@oven/bun-darwin-x64': 1.1.30
      '@oven/bun-darwin-x64-baseline': 1.1.30
      '@oven/bun-linux-aarch64': 1.1.30
      '@oven/bun-linux-x64': 1.1.30
      '@oven/bun-linux-x64-baseline': 1.1.30
      '@oven/bun-windows-x64': 1.1.30
      '@oven/bun-windows-x64-baseline': 1.1.30
--- a/renovate.json
+++ b/renovate.json
@ -1,7 +1,11 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": [
-    "https://git.1-h.cc/examples/renovate-example/raw/branch/main/default.json5"
+    "https://git.1-h.cc/examples/renovate-example/raw/branch/main/default.json5",
    ":automergeAll"
  ],
-  "dependencyDashboard": false
+  "dependencyDashboard": false,
  "packageRules": [
    { "minimumReleaseAge": "1 days", "matchPackageNames": [ "*" ] }
  ]
 }
--- a/setup-node-environment/action.yml
+++ b/setup-node-environment/action.yml
@ -38,30 +38,53 @@ runs:
      shell: bash
      id: prepare
      run: |
-        # Check package manager
+        # 判断是否需要 pnpm/action-setup
-        # packageManager=$(jq -r '.packageManager' package.json)
+        echo "#############################"
        setupPnpm=false
        packageManager=$(node -p "require('./package.json').packageManager")
-        echo "packageManager: $packageManager"
+        echo "packageManager: $packageManager found in package.json"
-        if [[ "$packageManager" == "pnpm"* ]]; then
+        if [[ "$packageManager" == "pnpm"* ]] && ! which pnpm > /dev/null; then
-          echo "setup-pnpm=true"
+          echo "the package manager is pnpm but pnpm is not installed"
-          echo "setup-pnpm=true" >> $GITHUB_OUTPUT
+          setupPnpm=true
        else
          echo "the package manager is not pnpm or pnpm is already installed"
        fi
        echo "setupPnpm: $setupPnpm"
        echo "setup-pnpm=$setupPnpm" >> $GITHUB_OUTPUT
        echo ""
-        # Check if pnpm-lock.yaml exists
+        # 判断是否需要运行 pnpm install
        echo "#############################"
        if [[ -f "pnpm-lock.yaml" ]]; then
-          echo "pnpm-lock.yaml exists"
+          echo "pnpm-lock.yaml exists. So pnpm install --frozen-lockfile will run"
          echo "pnpm-lock-exists=true" >> $GITHUB_OUTPUT
          echo "cache=pnpm" >> $GITHUB_OUTPUT
        else
-          echo "pnpm-lock.yaml does not exist"
+          echo "pnpm-lock.yaml does not exist. So pnpm install will not run"
        fi
        echo ""
        # 设置 node 版本
        echo "#############################"
        nodeVersion=$(sed -n 's/.*use-node-version=\([0-9.]*\).*/\1/p' .npmrc)
        if [[ -z "$nodeVersion" ]]; then
          nodeVersion="lts/*"
          echo "Node version not found in .npmrc. Using default: $nodeVersion"
        else
          echo "Node version found in .npmrc: $nodeVersion"
        fi
        echo "node-version=$nodeVersion" >> $GITHUB_OUTPUT
        echo ""
    - uses: pnpm/action-setup@v4 # https://github.com/pnpm/action-setup?tab=readme-ov-file#inputs
      if: steps.prepare.outputs.setup-pnpm == 'true'
    - uses: actions/setup-node@v4 # https://github.com/actions/setup-node?tab=readme-ov-file#usage
      with:
-        node-version: lts/*
+        node-version: ${{ steps.prepare.outputs.node-version }}
        cache: ${{ steps.prepare.outputs.cache }}
    - run: cat .npmrc
      shell: bash
    - name: 📦 Install Project Dependencies
      if: steps.prepare.outputs.pnpm-lock-exists == 'true'
      run: pnpm install --frozen-lockfile
Author	SHA1	Message	Date
严浩	b321d0e415	refactor: 移除 docker-build-push 工作流中的测试 vars 步骤	2024-10-15 23:07:09 +08:00
严浩	a436649d0b	feat: 更新 docker-build-push 工作流中的测试步骤以使用 vars 代替 secrets	2024-10-15 23:03:48 +08:00
严浩	8c48919d2b	feat: 在 docker-build-push 工作流中为测试步骤指定 bash shell	2024-10-15 23:00:32 +08:00
严浩	2d9eca2894	feat: 在 docker-build-push 工作流中添加测试 secrets 的步骤	2024-10-15 22:58:19 +08:00
严浩	64d6ac9814	feat: 在 renovate.json 中添加 packageRules 以设置最小发布年龄	2024-10-14 10:59:23 +08:00
严浩	c7b53ebd10	refactor: 移除 GitHub Actions 工作流中的 tree 命令	2024-10-14 10:57:18 +08:00
严浩	f7e317688b	feat: 在 GitHub Actions 工作流中添加 tree 命令以列出 hostedtoolcache 目录结构	2024-10-14 10:54:05 +08:00
严浩	ea235bf784	refactor: 简化 GitHub Actions 工作流中的调试步骤	2024-10-14 10:53:45 +08:00
严浩	f49701ce53	feat: 在 GitHub Actions 工作流中添加调试步骤，列出 hostedtoolcache 目录内容	2024-10-14 10:52:10 +08:00
严浩	92a737252b	feat: 更新 GitHub Actions 工作流，添加多平台和多 Node 版本支持	2024-10-14 10:48:27 +08:00
严浩	13dd5d7bdb	测试 actions/setup-node@v4	2024-10-14 09:32:12 +08:00
严浩	e7fd5cc26b	Update action.yml	2024-10-13 17:21:42 +08:00
严浩	d3c52b5b83	Update action.yml	2024-10-13 17:20:06 +08:00
严浩	52dbb4ce12	feat: 添加 .gitignore 文件，忽略 node_modules 目录；更新 package.json 以添加 bun 依赖	2024-10-12 18:39:42 +08:00
严浩	c7fa63d9b5	feat: 更新脚本注释，增加对 pnpm 和 node 版本的判断逻辑	2024-10-12 18:35:41 +08:00
严浩	de21dcf6bd	fix: 修正变量名拼写错误，将 setup-pnpm 更改为 setupPnpm	2024-10-12 18:25:14 +08:00
严浩	e57f1a275b	feat: 优化 Node 环境设置，改进 pnpm 检查逻辑并添加输出信息	2024-10-12 18:23:52 +08:00
严浩	f835a63583	feat: 简化输出信息，减少分隔符的使用	2024-10-12 18:12:10 +08:00
严浩	6cf720250a	feat: 简化 Docker 构建推送工作流，移除操作系统矩阵并强制使用 Ubuntu	2024-10-12 17:51:57 +08:00
严浩	76e102f6a5	feat: 更新工作流以使用最新的 macOS 版本	2024-10-12 17:49:34 +08:00
严浩	2dda4ee55a	feat: 更新 Docker 构建推送工作流以根据操作系统和发布状态动态决定构建推送	2024-10-12 17:47:12 +08:00
严浩	e01a0b34d8	feat: 强制在所有平台上构建和推送 Docker 镜像	2024-10-12 17:43:40 +08:00
严浩	5195d74ff1	feat: 更新工作流以支持多操作系统环境和动态构建推送	2024-10-12 17:43:23 +08:00
严浩	6e58674f53	feat: 更新工作流以添加 GitHub 托管标准运行器的说明 [skip ci]	2024-10-12 17:38:23 +08:00
严浩	ced3572c0a	feat: 更新工作流以支持多操作系统环境	2024-10-12 17:37:26 +08:00
严浩	3ef624f5d9	feat: 为工作流文件添加 pull_request 触发条件以支持路径过滤	2024-10-12 16:35:00 +08:00
严浩	f7f95de95a	feat: 在 renovate.json 中添加自动合并所有依赖项的配置	2024-10-12 16:32:27 +08:00
严浩	a34f085e86	feat: 移除工作流配置中的分支限制以简化触发条件	2024-10-12 16:24:08 +08:00
严浩	54a6963676	feat: 移除 action.yml 中的调试信息以简化节点版本提取逻辑	2024-10-12 15:53:42 +08:00
严浩	64ad47eb05	feat: 在 action.yml 中添加空行以增强输出信息的可读性	2024-10-12 15:53:23 +08:00
严浩	dd74c0faa2	feat: 在 setup-node-environment.yml 中添加输出 .npmrc 文件内容的调试信息	2024-10-12 15:52:55 +08:00
严浩	62d536c82e	feat: 在 action.yml 中添加调试信息以输出 node 版本的查找结果	2024-10-12 15:51:59 +08:00
严浩	a6aa3462f3	feat: 在 action.yml 中添加调试信息以便于提取 node 版本	2024-10-12 15:47:15 +08:00
严浩	c7455bfb3c	feat: 更新 .npmrc 文件以添加注释并简化 node 版本提取逻辑	2024-10-12 15:46:48 +08:00
严浩	4c23f82657	feat: 取消注释 setup-node-environment.yml 中的 sed 命令，以移除 .npmrc 文件中的 use-node-version 行	2024-10-12 15:41:32 +08:00
严浩	4eb4324252	feat: 在 setup-node-environment.yml 中添加换行符以改善可读性	2024-10-12 15:40:33 +08:00
严浩	a9d3e3eb96	fix: 修复 .npmrc 文件末尾缺少换行符的问题	2024-10-12 15:39:33 +08:00
严浩	b81659bab6	feat: 取消注释 setup-node-environment.yml 中的 cat 命令，以输出 .npmrc 文件内容	2024-10-12 15:38:22 +08:00
严浩	f1edd9e2b5	feat: 注释掉 setup-node-environment.yml 中的 sed 和 cat 命令，以便于调试	2024-10-12 15:37:37 +08:00
严浩	1fcbdefb2f	feat: 在 action.yml 中添加对 .npmrc 文件存在性的检查，以确保正确提取 Node 版本	2024-10-12 15:36:43 +08:00
严浩	55c4c305c0	feat: 更新 setup-node-environment.yml 和 action.yml，添加对未指定 Node 版本的默认处理	2024-10-12 15:27:46 +08:00
严浩	79f1925e81	feat: 在 setup-node-environment.yml 中添加调试信息，提取并输出 Node 版本	2024-10-12 15:25:21 +08:00
严浩	4f7bdd9fb4	feat: 更新 action.yml，添加对已安装 pnpm 的处理注释，并优化节点版本提取逻辑	2024-10-12 15:23:57 +08:00
严浩	7c58ef3294	feat: 更新 setup-node-environment.yml，添加第二个作业以检查 Node 和 PNPM 版本	2024-10-12 15:18:57 +08:00
严浩	9f1e52135c	feat: 更新 setup-node-environment.yml，添加容器镜像矩阵和失败策略	2024-10-12 15:13:52 +08:00
严浩	ae2a20ab90	feat: 更新 setup-node-environment/action.yml，改进输出信息格式以增强可读性	2024-10-12 15:10:16 +08:00
严浩	47b2bb8d26	fix: 修正 setup-node-environment.yml 中的 pnpm 检查，确保脚本在未找到 pnpm 时不会失败	2024-10-12 15:06:17 +08:00
严浩	f9d3465703	feat: 更新 setup-node-environment.yml 和 action.yml，添加版本检查和输出信息；新增 .npmrc 文件以指定 Node.js 版本	2024-10-12 15:05:23 +08:00
严浩	3d8306ca70	feat: 更新 deploy-dist-to-surge/action.yml，添加部署描述	2024-10-12 14:41:00 +08:00
严浩	c1cee30ad3	feat: 更新 deploy-dist-to-surge.yml，动态生成 HTML 内容并改进输出信息	2024-10-12 14:23:09 +08:00
严浩	fa63868c18	fix: 修正 deploy-dist-to-surge.yml 中的引用路径	2024-10-12 14:20:04 +08:00
		`@ -0,0 +1 @@`
							`use-node-version=22.9.0 # https://pnpm.io/zh/npmrc#use-node-version`