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

Merge Windows Debug-Build into Release-Build #858

Merged
merged 4 commits into from
Jun 28, 2021

Conversation

arogge
Copy link
Member

@arogge arogge commented Jun 22, 2021

As the difference between debug and release for Windows is the shipping of the sourcecode only, this PR merges both packages into one.
The Sourcecode is now an optional component that can be selected at install-time.

To reconfigure the builds, this PR also adds a .matrix.yml that will tell Jenkins to only do the release-builds in the future.

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

General
  • PR name is meaningful
  • Purpose of the PR is understood
  • Separate commit for this PR in the CHANGELOG.md, PR number referenced is same
  • Commit descriptions are understandable and well formatted
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
  • bareos-check-sources --since-merge does not report any problems
  • git status should not report modifications in the source tree after building and testing

@arogge arogge requested a review from pstorz June 22, 2021 13:56
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The matrix.yml file is not correct.

x86_64:
- bareos
- python-bareos
"4.4":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think here is something missing, probably
Univention:

@arogge arogge force-pushed the dev/arogge/master/merge-windows-builds branch 2 times, most recently from 5d17115 to be0a736 Compare June 22, 2021 15:08
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes sense to add a line to the CHANGELOG that the two windows builds were merged and only one Installer is now available for windows 32 and for windows 64.

@arogge arogge force-pushed the dev/arogge/master/merge-windows-builds branch 2 times, most recently from dd8bae4 to b9c7755 Compare June 24, 2021 14:53
@arogge arogge requested a review from pstorz June 24, 2021 17:24
@arogge
Copy link
Member Author

arogge commented Jun 24, 2021

I triple-checked that all distros are built, all files are still produced as desired (i.e. no webui tarballs) and added the CHANGELOG record you requested.

Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work, looks good to me. You might want to squash the last two commits.

arogge and others added 4 commits June 28, 2021 17:02
Previously there were two packages built, one contained the sourcecode
and the other one didn't.
Now we always add the sourcecode to the installer package, so people can
decide at install-time if they want to install the sources or not.
@arogge arogge force-pushed the dev/arogge/master/merge-windows-builds branch from 9eca2b5 to e7b5a2d Compare June 28, 2021 15:03
@arogge arogge merged commit 6dfdd48 into master Jun 28, 2021
@arogge arogge deleted the dev/arogge/master/merge-windows-builds branch June 28, 2021 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants