Test data files and assets have been moved to the main repository

Hi everyone,

This is basically an announcement that #137215 - Move tests data and assets into the main repository as Git-LFS - blender - Blender Projects has been implemented.

In short the motivational part is to eliminate the toil related on working with the test files and assets – there is plenty we need to worry about when making a PR with a new feature which adds new test files, but also maintenance of the release and LTS branches.

For the assets only the published files are in the main repository, which saves quite a bit of space and mitigates the initial download size of blender.git.

The documentation will be updated soon, there are a plenty of places where we’d need to update it. Would be good to have volunteers to help with that!

For the developers:

  • Assets are now in the top-level directory assets.
  • Files for regression tests are in tests/files.

The new folders are created so that it is easier to git bisect.

P.S. The announcement will likely be amended with more information as it comes.

LTS Branches

It was decided to only apply changes to the Blender 4.2 LTS branch. Blender 3.6 is almost EOL and it is not very practical to spend time on it.

Troubleshooting

Warnings to Ignore

It is normal to see the following warning:

warning: unable to rmdir 'release/datafiles/assets': Directory not empty
warning: unable to rmdir 'tests/data': Directory not empty

This is due to submodules configuration removed, but git will not remove the locations submodules were registered to unless they are empty. This is for the case if one has some uncommitted changes.

Errors switching Branches

If you see this warning when checking out, you may be unable to switch branches afterwards.

Encountered 348 files that should have been pointers, but weren't:

This is known to happen in one case. There was a short window between commit c39266f728e1ee3 and 9477fa4eb0b99a where some files were not using LFS when they should have.

If you happen to checkout one of those commits or a branch based on them, you can fix it as follows. Note that this will erase any uncommitted code changes.

git rm --cached -r .
git reset --hard

Certificate errors downloading files

If there is an invalid [http] sslCAPath configuration in ~/.gitconfig or blender/.git/config, the following can happen.

Error downloading object: ... tls: failed to verify certificate: x509: certificate signed by unknown authority

In the one case we encountered this, it was not there intentionally and removing it solved the problem.

9 Likes

I updated the description about the error that prevents switching branches, and the solution that @weizhen found.

Generally, switching branches between old and new, and release branches should be fine going forward. If you know of other cases where this happens, please let us know.

1 Like