Skip to content

avoid two possible ways to create $G/VERSION and $G/SYSCONFDIR.imp#10242

Merged
dlang-bot merged 1 commit intodlang:masterfrom
rainers:ci_version_sysconf
Jul 30, 2019
Merged

avoid two possible ways to create $G/VERSION and $G/SYSCONFDIR.imp#10242
dlang-bot merged 1 commit intodlang:masterfrom
rainers:ci_version_sysconf

Conversation

@rainers
Copy link
Member

@rainers rainers commented Jul 30, 2019

trying to fix the semophore CI failure.

There are currently two ways to generate the VERSION and SYSCONFDIR.imp files in the generated folder: via config.d or as a dependency in the build.d script. These might both get executed in arbitrary order and maybe generate different results,

@dlang-bot
Copy link
Contributor

Thanks for your pull request, @rainers!

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub fetch digger
dub run digger -- build "master + dmd#10242"

@rainers
Copy link
Member Author

rainers commented Jul 30, 2019

Looks promising, but this currently removes the unconditional updating of the hash in the version file.
This functionality should probably be added to build.d so it can replace config.d.

@rainers rainers force-pushed the ci_version_sysconf branch from 97d0428 to f88054e Compare July 30, 2019 11:37
@rainers
Copy link
Member Author

rainers commented Jul 30, 2019

This functionality should probably be added to build.d so it can replace config.d.

copied updateIfChanged over to build.d but left config.d in place for now to not break dependent projects (it's referenced in dub.sdl).

@Geod24
Copy link
Member

Geod24 commented Jul 30, 2019

Thanks for taking care of this :)

@dlang-bot dlang-bot merged commit 5bfa3a2 into dlang:master Jul 30, 2019
@marler8997
Copy link
Contributor

Nice work figuring this one out

@WalterBright
Copy link
Member

Thank you, @rainers !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants