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

Use Git LFS for PE and font files #879

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Use Git LFS for PE and font files #879

merged 2 commits into from
Jul 30, 2024

Conversation

s09bQ5
Copy link
Collaborator

@s09bQ5 s09bQ5 commented Jul 29, 2024

This moves all .exe, .dll, .debug, .ttc, and .ttf files to Git LFS storage.
I decided to do this for the fonts as well because the two biggest of them are almost 20 MB each.

We do have some audio files, videos, and pictures in the repository, but many of them are small.

@barbeque-squared
Copy link
Member

I decided to do this for the fonts as well because the two biggest of them are almost 20 MB each.

Good call!

@barbeque-squared barbeque-squared merged commit 66415c7 into master Jul 30, 2024
9 checks passed
@barbeque-squared barbeque-squared deleted the lfs branch July 30, 2024 05:07
@s09bQ5
Copy link
Collaborator Author

s09bQ5 commented Jul 30, 2024

Shit, there is a 1 GB traffic limit for free accounts and we already hit that limit.
Force push to undo this pull request?

@barbeque-squared barbeque-squared restored the lfs branch July 30, 2024 07:29
@barbeque-squared
Copy link
Member

@s09bQ5 👍 go ahead with a force push to undo this PR.
(I think you have the write access to do that? If not comment here and I'll do it manually)

@s09bQ5
Copy link
Collaborator Author

s09bQ5 commented Jul 30, 2024

I can't force-push to master. The master branch is protected. @basisbit can you force-push 72e8473 to master or change the protection of the master branch?

@bohning
Copy link
Collaborator

bohning commented Jul 30, 2024

Please try again now, @s09bQ5.

@s09bQ5
Copy link
Collaborator Author

s09bQ5 commented Jul 30, 2024

Still protected:

remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: Changes must be made through a pull request. Cannot force-push to this branch
To github.com:UltraStar-Deluxe/USDX.git
 ! [remote rejected]   pre-lfs -> master (protected branch hook declined)

@bohning
Copy link
Collaborator

bohning commented Jul 30, 2024

Now?

@s09bQ5
Copy link
Collaborator Author

s09bQ5 commented Jul 30, 2024

same

@bohning
Copy link
Collaborator

bohning commented Jul 30, 2024

Hmm...
image
Then I don't know how to disable it without deleting the entire master branch rule.

@barbeque-squared
Copy link
Member

it probably has something to do with this: https://github.com/settings/organizations

for me it looks like this:
2024-07-30-130838_385x130_scrot

I'm assuming it's the same for s09bQ5

@bohning that screenshot looks like it's doing something on the organization level, which is weird because https://github.com/orgs/UltraStar-Deluxe/people lists only 4 people. I don't know who the other 4 even would be. It has a search box though to add more people, just add s09bQ5 manually in there? (and then remove again once force-pushed)

(I'll be on Discord in about 2-3 hours from now, in case we've had no luck by then)

@s09bQ5
Copy link
Collaborator Author

s09bQ5 commented Jul 30, 2024

I can't join an organization because I still haven't set up 2FA.
I guess the easiest would be if one of you does the force push.

@bohning
Copy link
Collaborator

bohning commented Jul 30, 2024

I tried adding @s09bQ5, but the only choice I could make was UltraStar-Deluxe/contributors. Now I added @s09bQ5 manually, try again now. But maybe this allows force pushes to other branches, but still not to (protected) main.

image

@s09bQ5
Copy link
Collaborator Author

s09bQ5 commented Jul 30, 2024

success

@barbeque-squared
Copy link
Member

btw I restored the lfs branch earlier today (when it became apparent we needed force push master to fix this mess) because I wasn't sure if there was anything in it you wanted to salvage. Feel free to delete it when it's no longer necessary.

@s09bQ5 s09bQ5 deleted the lfs branch July 30, 2024 11:31
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.

3 participants