Dirty Git Instances

[Insprill]

@ButteredCats @DarkCat09 I've noticed that both of you are running instances that have been modified outside of the official release tags, without providing the modified source code. This is technically a violation of the AGPL-3.0 license intellectual is released under. What's the reason for this? If there's something missing that either of you requires, please feel free to make an issue about it or submit a pull request. If it isn't something that belongs upstream, then please push the source code somewhere and avoid running dirty builds. The version info in the top left of the navbar is designed to always link to the exact commit the server is built from. Since you're both running dirty builds based on my repo, the link is just a 404. I'd like that button to always work so users can always see what code is running server-side.

Apologies if this came off aggressive. I didn't mean it that way, but wasn't sure how to word it otherwise 😅

[ButteredCats]

All good lol, I get wanting to protect your work. I shouldn't have anything changed though so I'm not sure why that's happening.

My script to update the repo and rebuild resets the whole thing before building too (although this isn't a project where I keep having to apply patches so it isn't really needed):

/usr/bin/su intellectual -s /bin/sh -c '/usr/bin/rm -rf target'

/usr/bin/su intellectual -s /bin/sh -c '/usr/bin/git reset --hard HEAD'
/usr/bin/su intellectual -s /bin/sh -c '/usr/bin/git pull'

/usr/bin/su intellectual -s /bin/sh -c '/usr/bin/cargo build --release'

/usr/bin/su intellectual -s /bin/sh -c '/usr/bin/mv target/release/intellectual .'

/usr/bin/su intellectual -s /bin/sh -c '/usr/bin/chmod +x intellectual'

Could having untracked files cause it?

[Insprill]

All the git info is collected at build time (in build.rs). The dirty state is determined by git status --porcelain. If anything is returned, it's dirty. The hash is retrieved from git rev-parse --short HEAD.

From a quick test with the commands in your script, the intellectual binary you move to the root directory is never removed, and that does show up in git status. That explains the dirty flag, but doesn't explain the different commit hash 🤔.

[ButteredCats]

I don't think I have a different hash? The link (on the US server, which is one commit behind) is https://github.com/Insprill/intellectual.git/tree/eb7797c

Just removing the .git brings it to a valid commit which is the one it was built from.

Unless I'm misunderstanding what you're talking about?

As for the dirty I can pretty easily stop moving the binary, I don't know why I even did it to begin with. But I'll have to figure out what to do about the updater script and .cargo being in there because that folder is the intellectual user's home directory.

[Insprill]

Ahh, I totally missed the .git in the repo URL. I usually clone without the .git suffix, so it wasn't in my remotes, which is why it worked for me. Not sure how I missed the fact that the commit ID is the same - should probably go to bed 😅. Fixed in a842d78

As for the dirty state, can't you clone the repo to a subdirectory? Not sure what your workflow/setup is like, if that'd be possible. If there's anything I can change in the repo that would help, let me know.

[ButteredCats]

Subdirectory would definitely work and that's probably what I'll end up doing.

Makes it slightly different than everything else but given this isn't a project where I'm constantly fidgeting with it to stay unblocked it doesn't bother me.

Ignoring .cargo would be nice though. It'd let me bring this back in line with everything else once I migrate the updater script to an ansible playbook (and would give me the push to do so). I imagine that's super uncommon though so I get it if you don't.

This is all a tomorrow issue after finals though lmao. I'll let you know once it's all set.

[Insprill]

I added .cargo to the gitignore since we aren't using it in the project (for now at least, but I don't see that changing anytime soon).

[DarkCat09]

The only modification i made is this patch: #45 (comment)

Is it enough for AGPL? I can create a separate repo if needed.
Upd: i noticed you already fixed the bug, so i'll just do git pull

[DarkCat09]

Apologies if this came off aggressive

No, it's okay <3

[DarkCat09]

Done, updated to the latest git commit

[ButteredCats]

Both my servers are no longer dirty!
https://intellectual.us.catsarch.com/
https://intellectual.de.catsarch.com/