search

MovingBlocks / Terasology

Terasology - open source voxel world
http://terasology.org
Apache License 2.0
3.64k stars 1.33k forks source link

new artifactory for master branch #5205

Closed soloturn closed 5 months ago

soloturn commented 6 months ago

new artifactory url for master branch. not sure if we want to go down that path ...

replacement done with:

❯ git grep -l 'http://artifactory.terasology.org' | xargs sed -i 's-http://artifactory.terasology.org-https://artifactory.terasology.io-g'
BenjaminAmos commented 6 months ago

Usually the master branch is reserved for releases but since it's currently unbuildable without this change this may be a special case. I'm not sure about it right now. If we merge this then develop and master will become divergent which may make future merges less straightforward.

soloturn commented 6 months ago

i would not apply it tbh. the engine builds with the change. but the modules do not (at least for me) as the dependency versions are structured so that java-17 is dragged in.

if this pr is really applied to master, one might consider, from a git point of view, something a little brute force to ignore changes on master, and declare develop good as it is. divergence is gone, and usual merge to master afterwards possible:

git checkout develop
git merge -s ours origin/master
jdrueckert commented 5 months ago

I'd argue master doesn't need to build right now. Anyone desiring to build from master can also "just" reset engine and module develop branches locally to the date of our last release. Let's keep master the way it is until our next release.