GitHub Actions私有仓同步公仓遇git clone认证错误及冲突问题

问题概述 #

在私有仓库运行GitHub Actions工作流同步到公共仓库时，遇到两个核心问题：

• 直接使用git clone https://$TOKEN@github.com/xxx.git克隆私有仓库，报错fatal: could not read Password for 'https://***@github.com': No such device or address
• 使用actions/checkout@v4克隆后，执行git pull --rebase时出现合并冲突，如CONFLICT (add/add): Merge conflict in src/main.rs

完整工作流配置 #

on:
  workflow_dispatch:
  schedule:
    - cron:  '0 */1 * * *'

env:
  TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
  build:
    runs-on: ubuntu-latest

    steps:
    - name: Checkout
      run: git clone https://$TOKEN@github.com/JonathanWoollett-Light/sync-test-private.git
    - name: Move
      run: cd sync-test-private
    - name: Sync
      run: git pull --rebase https://github.com/JonathanWoollett-Light/sync-test
    - name: Commit
      run: git push --force

错误日志 #

git clone错误日志 #

Run git clone https://$TOKEN@github.com/JonathanWoollett-Light/sync-test-private.git
  git clone https://$TOKEN@github.com/JonathanWoollett-Light/sync-test-private.git
  shell: /usr/bin/bash -e {0}
  env:
    TOKEN: ***
Cloning into 'sync-test-private'...
fatal: could not read Password for 'https://***@github.com': No such device or address
Error: Process completed with exit code 128.

actions/checkout错误日志 #

Run git pull --rebase https://github.com/JonathanWoollett-Light/sync-test
From https://github.com/JonathanWoollett-Light/sync-test
 * branch            HEAD       -> FETCH_HEAD
Auto-merging src/main.rs
CONFLICT (add/add): Merge conflict in src/main.rs
Rebasing (1/1)
error: could not apply 34b15ec... Sync action
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 34b15ec... Sync action
Error: Process completed with exit code 1.

解决方案 #

1. 修复克隆与目录切换问题 #

原工作流存在两个关键缺陷：

• 每个run步骤是独立Shell进程，cd sync-test-private仅在当前步骤生效，后续步骤会回到默认工作目录，导致git pull找不到仓库
• URL直接拼接Token易触发Git凭证读取错误，建议用actions/checkout克隆私有仓库，稳定性更高

方案1：用actions/checkout克隆并指定目录

- name: Checkout private repo
  uses: actions/checkout@v4
  with:
    repository: JonathanWoollett-Light/sync-test-private
    token: ${{ secrets.GITHUB_TOKEN }}
    path: sync-test-private  # 指定克隆到目标目录

方案2：同一run内完成克隆与后续操作

若坚持用git clone，需在同一个run里执行所有仓库内操作，避免目录切换失效：

- name: Clone and sync
  run: |
    git clone https://${{ secrets.GITHUB_TOKEN }}@github.com/JonathanWoollett-Light/sync-test-private.git
    cd sync-test-private
    # 后续git操作都放在这个代码块内

2. 解决合并冲突问题 #

冲突源于私有仓库与公共仓库的同一文件存在不同修改，需根据同步需求选择处理方式：

场景A：强制用公共仓库内容覆盖私有仓库

若目标是让私有仓库完全同步公共仓库内容，无需保留私有仓库本地修改，用git reset替代pull --rebase：

- name: Sync from public repo
  working-directory: sync-test-private
  run: |
    git remote add public https://github.com/JonathanWoollett-Light/sync-test
    git fetch public
    git reset --hard public/main  # 替换为公共仓库目标分支
    git push origin main --force

场景B：自动解决冲突（保留指定方内容）

若需保留私有仓库修改并自动解决冲突，可使用git pull的策略选项：

- name: Sync with conflict resolution
  working-directory: sync-test-private
  run: |
    git remote add public https://github.com/JonathanWoollett-Light/sync-test
    # 保留私有仓库修改，自动解决冲突
    git pull --rebase -X theirs public main
    # 若需保留公共仓库修改，替换为 -X ours
    git push origin main --force

场景C：手动解决冲突（复杂场景）

若冲突需自定义处理，可添加自动修复脚本（需根据实际冲突编写）：

- name: Resolve conflicts
  working-directory: sync-test-private
  run: |
    git pull --rebase public main || true
    # 这里添加冲突修复脚本，例如用sed修改冲突文件
    git add src/main.rs
    git rebase --continue
    git push origin main --force

最终完整工作流示例（强制覆盖场景） #

on:
  workflow_dispatch:
  schedule:
    - cron: '0 */1 * * *'

jobs:
  sync:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout private repository
        uses: actions/checkout@v4
        with:
          repository: JonathanWoollett-Light/sync-test-private
          token: ${{ secrets.GITHUB_TOKEN }}
          path: sync-test-private

      - name: Sync from public repository
        working-directory: sync-test-private
        run: |
          git remote add public https://github.com/JonathanWoollett-Light/sync-test
          git fetch public
          git reset --hard public/main
          git push origin main --force

内容的提问来源于stack exchange，提问作者Jonathan Woollett-light