feat: 简化 Docker 构建推送工作流，移除操作系统矩阵并强制使用 Ubuntu

feat: 更新工作流以使用最新的 macOS 版本
feat: 更新 Docker 构建推送工作流以根据操作系统和发布状态动态决定构建推送
2025-07-14 07:10:48 +08:00 · 2024-10-12 17:51:57 +08:00 · 2024-10-12 17:49:34 +08:00 · 2024-10-12 17:47:12 +08:00 · 2024-10-12 17:43:40 +08:00 · 2024-10-12 17:43:23 +08:00
7 changed files with 91 additions and 18 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"
@ -10,10 +12,46 @@ env:
 jobs:
  job:
    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;
  job-2: # 测试 .npmrc 文件没有 use-node-version 字段
    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;
--- 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/renovate.json
+++ b/renovate.json
@ -1,7 +1,8 @@
 {
  "$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
 }
--- a/setup-node-environment/action.yml
+++ b/setup-node-environment/action.yml
@ -39,28 +39,53 @@ runs:
      id: prepare
      run: |
        # Check package manager
        # packageManager=$(jq -r '.packageManager' package.json)
        packageManager=$(node -p "require('./package.json').packageManager")
-        echo "packageManager: $packageManager"
+        echo "##########################################################"
        echo "packageManager: $packageManager found in package.json"
        echo ""
        if [[ "$packageManager" == "pnpm"* ]]; then
          echo "##########################################################"
          # TODO: 还有一种情况就是镜像中已经安装了pnpm。
          echo "setup-pnpm=true"
          echo ""
          echo "setup-pnpm=true" >> $GITHUB_OUTPUT
        fi
        # Check if pnpm-lock.yaml exists
        if [[ -f "pnpm-lock.yaml" ]]; then
-          echo "pnpm-lock.yaml exists"
+          echo "##########################################################"
          echo "pnpm-lock.yaml exists. So pnpm install --frozen-lockfile will run"
          echo ""
          echo "pnpm-lock-exists=true" >> $GITHUB_OUTPUT
          echo "cache=pnpm" >> $GITHUB_OUTPUT
        else
          echo "pnpm-lock.yaml does not exist"
        fi
        # Extract the node version from the .npmrc file
        nodeVersion=$(sed -n 's/.*use-node-version=\([0-9.]*\).*/\1/p' .npmrc)
        if [[ -z "$nodeVersion" ]]; then
          nodeVersion="lts/*"
          echo "##########################################################"
          echo "Node version not found in .npmrc. Using default: $nodeVersion"
          echo ""
        else
          echo "##########################################################"
          echo "Node version found in .npmrc: $nodeVersion"
          echo ""
        fi
        echo "node-version=$nodeVersion" >> $GITHUB_OUTPUT
    - 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 }}
    - name: 📦 Install Project Dependencies
      if: steps.prepare.outputs.pnpm-lock-exists == 'true'
Author	SHA1	Message	Date
严浩	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`