Skip to content

C
CivWeb
Commit 08ccc69e authored by 崔佳豪's avatar 崔佳豪
Browse files
Options

fix: ci allow-unrelated-histories

parent 04061dce
Pipeline #53778 waiting for manual action with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 1 addition and 1 deletion
        .gitlab-ci.yml
        View file @ 08ccc69e
        ......@@ -60,7 +60,7 @@ push:
        - 'git reset --hard head'
        - 'git clean -fd'
        - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"'
        - 'git pull origin map'
        - 'git pull origin map --allow-unrelated-histories'
        #- 'git rm -rf "${TARGET_REPO}/civbase"'
        #- 'git commit -m "chore: clear folder"'
        #- 'git push origin map'
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment