Skip to content

Mirroring to GitLab is failing #2569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
1 task done
jobara opened this issue Mar 4, 2025 · 0 comments · Fixed by #2572
Closed
1 task done

Mirroring to GitLab is failing #2569

jobara opened this issue Mar 4, 2025 · 0 comments · Fixed by #2572
Labels
bug Something isn't working

Comments

@jobara
Copy link
Collaborator

jobara commented Mar 4, 2025

Prerequisites

Describe the bug

GitLab mirroring is failing, at least for Dev due to a the codebase diverging.

# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
From git.kube.v1.colab.coop:iris/iris-accessibility
 * branch              development -> FETCH_HEAD
 * [new branch]        development -> gitlab/development
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Error: Process completed with exit code 128.

See: https://github.com/accessibility-exchange/platform/actions/runs/13654326754/job/38169764057

This has actually been failing since Jan 27, 2025 but was just noticed today. There was a change pushed directly to the GitLab instance on Jan 25, 2025. Which likely accounts for the diverged codebase.

To Reproduce

Merge any changes to dev and notice the Mirror dev to GitLab action is failing.

Expected behavior

The GitHub hosted branches for dev, staging, and production should be mirrored in the GitLab instances without any errors.

Screenshots

No response

Details

  • Device:
  • Operating system:
  • Browser:
  • Link to affected page:

Additional context

No response

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant