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

Change configuration directory of debug builds #335

Merged
merged 1 commit into from May 12, 2019

Conversation

@Forgon2100
Copy link
Contributor

commented Apr 25, 2019

When testing new branches with debug builds, the configuration directory
ends in "master", irrespective of the branch it belongs to (unless the
build is checked out at a specific tag).

This behavior is obscure, not least because the version string is not
changed in a similar manner. In addition, this can lead to bugs if files
in the configuration directory have been changed by another branch, e.g.
keymap.json.

It may be a remnant of changing the configuration directory's location
(view 6198e8f for details).

I suggest to create a new configuration directory for each new branch.

Change configuration directory of debug builds
* debug builds not checked out at a specific tag use own branch names
  as part of configuration directory name, not defaulting to "master"
* ensure similar naming of version string and configuration directory
* keep ignoring new behavior if WZ_USE_MASTER_BRANCH_APP_DIR is defined

Refs 6198e8f
Fixes #335
@Forgon2100

This comment has been minimized.

Copy link
Contributor Author

commented Apr 26, 2019

The failing build is probably not caused by a fault in my commit:

Error uploading artifact the storage: Unable to read data from the transport connection: The connection was closed.

@past-due past-due added this to the 3.3.0_beta2 milestone May 12, 2019

@past-due

This comment has been minimized.

Copy link
Contributor

commented May 12, 2019

I think this change makes sense.

As a separate change, it may make sense to add a CMake option to set WZ_USE_MASTER_BRANCH_APP_DIR.

@past-due past-due merged commit e9830eb into Warzone2100:master May 12, 2019

8 checks passed

LGTM analysis: C/C++ No new or fixed alerts
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No code changes detected
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
freebsd_build FreeBSD:freebsd-11-2-release-amd64 Task Summary
Details
freebsd_build FreeBSD:freebsd-12-0-release-amd64 Task Summary
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.