Skip to content
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

Upgrade GitLab CE to 15.1.0 #2596

Merged
merged 3 commits into from
Jul 2, 2022
Merged

Conversation

sachilles
Copy link
Collaborator

@kkimurak
Copy link
Contributor

kkimurak commented Jun 25, 2022

Hmm the build fails with

rake aborted!
ERROR: This installation of GitLab uses unsupported database names in 'config/database.yml': geo. The only supported ones are main, ci.

This is happen because geo entry is exist on config/database.yml.example.postgresql of upstream source.
To pass temporally, we need to delete it after copying this as database.yml or have different approach.

@sachilles Do you have any idea ?

@sachilles
Copy link
Collaborator Author

I think the temporary workaround you suggest is the simplest solution. (However, we should include a note in the installation script).

@sachilles
Copy link
Collaborator Author

We should perhaps include the configuration file in our repo below assets/build (e.g. as assets/build/config/database.yml.postgresql).

This would then be a copy from the upstream repo, just without the geo entry.

@kkimurak
Copy link
Contributor

OK build succeed. but let me remind you what #2580 was for :)

@sachilles
Copy link
Collaborator Author

Thanks, I'll check if I did a rebase or not. In any case, I guess including PRs #2579, #2580, and #2594 would be fine.

Probably, I should create an additional branch for version 15.0.x-stable(or just 15.0.x) the backport changes arising in version 15.1.x. This is similar to the redmine repo (see https://github.com/sameersbn/docker-redmine/).

What do you think?

@kkimurak
Copy link
Contributor

@sachilles I find it difficult to patch past versions on multiple branches and provide a fixed version. Even if we have only one release branch, we are still providing releases with bugs and stale configs.

Above all, I'm worried that the job will be a burden to the maintainer and that you are the only active maintainer. I apologize for not being able to make any further efforts. I can still contribute, but I can't be a maintainer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants