Skip to content

unify and merge builds where possible#1309

Merged
pstorz merged 13 commits intobareos:masterfrom
arogge:dev/arogge/master/build-on-rhel9
Dec 9, 2022
Merged

unify and merge builds where possible#1309
pstorz merged 13 commits intobareos:masterfrom
arogge:dev/arogge/master/build-on-rhel9

Conversation

@arogge
Copy link
Member

@arogge arogge commented Nov 9, 2022 •
edited by pstorz
Loading

  • EL_9 builds on RHEL 9 and is tested on RHEL and all clones
  • EL_8 builds on RHEL 8 and is tested on RHEL and all clones
  • EL_7 builds on RHEL 7 and is tested on RHEL and CentOS
  • SUSE_15 builds on SLE 15 SP4 and is tested on SLE 15 SP3, SLE 15 SP4, openSUSE 15.3 and openSUSE 15.4
  • new Fedora_37 build
  • disable Fedora_35 and Ubuntu_18.04
  • removes old CentOS and RHEL builds
  • improve the SPECfile to not use SUSE/OBS macros for RHEL/Fedora builds anymore

Thank you for contributing to the Bareos Project!

  • 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
  • Commit descriptions are understandable and well formatted
  • Check backport line
  • Is the PR title usable as CHANGELOG entry?
  • Separate commit for CHANGELOG.md ("update CHANGELOG.md"). The PR number is correct.
  • Merge Branch PR-1309 in the CD repository before merging this PR!
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

@arogge arogge marked this pull request as draft November 9, 2022 15:11
@arogge arogge force-pushed the dev/arogge/master/build-on-rhel9 branch 2 times, most recently from e47744c to 3f46732 Compare November 10, 2022 14:09
@arogge arogge force-pushed the dev/arogge/master/build-on-rhel9 branch from e5e5819 to 5b4ebaa Compare November 22, 2022 14:49
@arogge arogge changed the title matrix: use rhel9 instead of centos9 image unify and merge builds where possible Nov 23, 2022
@arogge arogge force-pushed the dev/arogge/master/build-on-rhel9 branch from 003d665 to afeded4 Compare December 1, 2022 14:51
@pstorz pstorz force-pushed the dev/arogge/master/build-on-rhel9 branch from afeded4 to 08bf0fd Compare December 5, 2022 08:37
@arogge arogge force-pushed the dev/arogge/master/build-on-rhel9 branch 2 times, most recently from 73a45bf to 7cd48db Compare December 8, 2022 06:33
@arogge arogge force-pushed the dev/arogge/master/build-on-rhel9 branch 2 times, most recently from 561b771 to 28f3884 Compare December 8, 2022 17:29
pstorz
pstorz approved these changes Dec 9, 2022
View reviewed changes
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.

Looks good!

@arogge arogge marked this pull request as ready for review December 9, 2022 09:31
@pstorz pstorz force-pushed the dev/arogge/master/build-on-rhel9 branch 4 times, most recently from d461ec2 to 5ae1703 Compare December 9, 2022 15:42
arogge added 11 commits December 9, 2022 16:51
@arogge @pstorz
matrix: use rhel9 instead of centos9 image
532bbce
@arogge @pstorz
packaging: fix rpm macro handling
07ff244 
There were still OBS macros used in the spec file, which are now cleaned
up. Besides that rhel/centos is now unified using the rhel macro, that
is also available on all clones.
@arogge @pstorz
build: CentOS_7 / RHEL_7 -> EL_7
bcabd89
@arogge @pstorz
build: unify RHEL builds with their clones
9ad4604
@arogge @pstorz
build: add Fedora 37
661ef17
@arogge @pstorz
build: unify SUSE builds
765d040
@arogge @pstorz
remove unused sections from specfile
967325c
@arogge @pstorz
build: remove Ubuntu 18.04
afe4b0e
@arogge @pstorz
build: remove Fedora 35
1eb8846
@arogge @pstorz
build: remove Solaris/SPARC
60a901c
@arogge @pstorz
build: use %make_build where available
56df713 
Change the old %__make in our specfile to the more standard %make_build
which is, of course, not available on SLES.
arogge and others added 2 commits December 9, 2022 16:51
@arogge @pstorz
rpmbuild: use make install/fast to avoid rebuild
8738740 
Some builds decided that they needed to rebuild on the make install
again even though the build had just finished.
By using `make install/fast` we avoid the dependency on all which will
avoid the second build that should not have happened in the first place.
@pstorz
Update CHANGELOG.md
1712251
@pstorz pstorz force-pushed the dev/arogge/master/build-on-rhel9 branch from 738d01c to 1712251 Compare December 9, 2022 15:51
@pstorz pstorz merged commit 405ae06 into bareos:master Dec 9, 2022
@arogge arogge deleted the dev/arogge/master/build-on-rhel9 branch December 12, 2022 09:51
alaaeddineelamri pushed a commit that referenced this pull request Dec 30, 2022
@pstorz
Merge pull request #1309
5c3bdf6 
unify and merge builds where possible
alaaeddineelamri pushed a commit that referenced this pull request Dec 30, 2022
@pstorz
Merge pull request #1309
4fa6c12 
unify and merge builds where possible
alaaeddineelamri pushed a commit that referenced this pull request Dec 30, 2022
@pstorz
Merge pull request #1309
4cf53a6 
unify and merge builds where possible
alaaeddineelamri pushed a commit that referenced this pull request Dec 31, 2022
@pstorz
Merge pull request #1309
5550a0b 
unify and merge builds where possible
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pstorz pstorz pstorz approved these changes

Assignees

@pstorz pstorz

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@arogge @pstorz