/lmms

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

Revert contributor file removal #4307

Merged
merged 2 commits into from Apr 25, 2018

Conversation

Reviewers

@Wallacoloo Wallacoloo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  1.2.0
3 participants
@lukas-w @tresf @Wallacoloo
@lukas-w
Member

lukas-w commented Apr 21, 2018 •
edited

Re-introduces the code that generates the CONTRIBUTORS file using git, removed by via #3016. The intent by @jasp00 was to generate it by an automated task on our servers (see LMMS/lmms.io#198) that would commit it into the source tree, but this was never finished (I don't know the exact status on this).

image

Closes #2914.

lukas-w added some commits Apr 21, 2018

@lukas-w
Revert CONTRIBUTOR file removal 
This reverts commit 30f1e52.

# Conflicts:
#	CMakeLists.txt
33368bd
@lukas-w
Update project year
Loading status checks…
50eada6

@lukas-w lukas-w added this to the 1.2.0 milestone Apr 21, 2018

lukas-w referenced this pull request Apr 21, 2018

@jasp00 @tresf
Allow PROJECT_YEAR override (#3016) 
* Allow PROJECT_YEAR override

* Generate release information and build with it

* Delegate to maintenance tasks
30f1e52
@tresf

This comment has been minimized.

Sign in to view
Member

tresf commented Apr 21, 2018

@jasp00's arguments were valid... git shouldn't be a hard-requirement and builds should be reproducible 100% of the time. That said... we've been shipping a blank contributor's list with all RCs because that PR never got completed. Thanks @lukas-w!
@Wallacoloo

This comment has been minimized.

Sign in to view
Member

Wallacoloo commented Apr 25, 2018

Looks good to me.

@Wallacoloo Wallacoloo self-requested a review Apr 25, 2018

@lukas-w lukas-w merged commit e614711 into stable-1.2 Apr 25, 2018
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@lukas-w lukas-w deleted the fix/contributors branch Apr 25, 2018

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