#57 scripts: add a 'NIGHTLY' argument to the scripts to make the inclusion of git commit hash and date optional
Merged by ryanabx. Opened by ryanabx.

scripts: add a 'NIGHTLY' argument to the scripts to make the inclusion of git commit hash and date optional

this commit makes it possible for us to use the srpm and no-source-srpm script to make tagged releases
also bump version to 1.0.0~alpha.2 (from 0.1.0)
Signed-off-by: Ryan Brue <ryanbrue.dev@gmail.com>

I think we should add a new boolean variable for this, ex: NIGHTLY or smtg. And set it in each package of one of the two copr.

Also,

# Ensure COMMIT is set to a git hash (it could be a tag like epoch-1.0.0-alpha.2)
COMMIT=$(git rev-parse HEAD)

i'm not sure we want the head here. First google search give this https://stackoverflow.com/questions/1862423/how-to-tell-which-commit-a-tag-points-to-in-git (haven't tested it)

The logic with rev-parse HEAD there was to grab the current commit that's downloaded and checked out on the local repo. My understanding is if you check out a tag (i.e. epoch-1.0.0-alpha.2) and then rev-parse HEAD, you'll get the commit of that tag. I could be wrong though

I think we should add a new boolean variable for this, ex: NIGHTLY or smtg. And set it in each package of one of the two copr.

We can, that just takes a lot of time to update them all

The logic with rev-parse HEAD there was to grab the current commit that's downloaded and checked out on the local repo. My understanding is if you check out a tag (i.e. epoch-1.0.0-alpha.2) and then rev-parse HEAD, you'll get the commit of that tag. I could be wrong though

Yeah probably. My bad.

rebased onto 04c74e7551c7bff6b7336e67fa5e8c16c3b48170

rebased onto 04c74e7551c7bff6b7336e67fa5e8c16c3b48170

should it be $VERSION^git%{commitdate}.%{shortcommit} ?

should it be $VERSION^git%{commitdate}.%{shortcommit} ?

There's differing opinions, Neal and Carl talked about the two in depth, and we decided back then that it was probably best to just keep it the way it was

Do we really need ~^${CURRENT_DATE}gitnone ?

There's differing opinions, Neal and Carl talked about the two in depth, and we decided back then that it was probably best to just keep it the way it was

Ok, i was just looking at the last comment from Conan

and if you want to do git snapshots on it, something like this works: 1.0.0~alpha.2^git.

Imo, it makes more sense like that but who care i guess lol

We can certainly revisit the decision. I think that having git before the hash makes more sense because git is describing the hash itself, not the date. But on the other hand, letting the user know it's a snapshot by putting git as close to the left as possible might be a pro for the other way.

For me its just that the date is the date of the last commit, not the current date.

For me its just that the date is the date of the last commit, not the current date.

You're right, that makes sense. It wasn't always that way, and when we made the decision it was the date of building. I'm convinced

Do we really need ~^${CURRENT_DATE}gitnone ?

We do not, I removed that in this commit

rebased onto 04c74e7551c7bff6b7336e67fa5e8c16c3b48170

I think we should checkout the exact tag when doing a tagged release. But i don't want to block this PR for this, because i don't find an easy solution rn, notably because pop-launcher don't have the same tags of other packages (will see if it will change in the future since i mentioned it on Matrix).

So lgtm

I think we should checkout the exact tag when doing a tagged release. But i don't want to block this PR for this, because i don't find an easy solution rn, notably because pop-launcher don't have the same tags of other packages

Yeah, my plan was to set COMMIT=epoch-1.0.0-alpha.2 in the bootstrap script, then the script should git reset --hard epoch-1.0.0-alpha.2, which I believe should work? I'm gonna test drive it with one package in the -tagged copr to see if it works that way

Pull-Request has been merged by ryanabx

Yeah, my plan was to set COMMIT=epoch-1.0.0-alpha.2 in the bootstrap script, then the script should git reset --hard epoch-1.0.0-alpha.2, which I believe should work? I'm gonna test drive it with one package in the -tagged copr to see if it works that way

Hum, updating each package at each release will take a long time... Personally, i will keep using HEAD for now