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.

Sign up for GitHub

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

Jump to bottom

feat: Enhance the RPM build #1522

Merged
merged 5 commits into from
Aug 11, 2023
Merged

feat: Enhance the RPM build #1522

merged 5 commits into from
Aug 11, 2023

Conversation

MichaelsJP
Copy link
Member

@MichaelsJP MichaelsJP commented Aug 8, 2023 •
edited

Pull Request Checklist

  • 1. I have rebased the latest version of the master branch into my feature branch and all conflicts
    have been resolved.
  • 2. I have added information about the change/addition to functionality to the CHANGELOG.md file under the
    [Unreleased] heading.
  • 3. I have documented my code using JDocs tags.
  • 4. I have removed unnecessary commented out code, imports and System.out.println statements.
  • 5. I have written JUnit tests for any new methods/classes and ensured that they pass.
  • 6. I have created API tests for any new functionality exposed to the API.
  • 7. If changes/additions are made to the ors-config.json file, I have added these to the ors config documentation
    along with a short description of what it is for, and documented this in the Pull Request (below).
  • 8. I have built graphs with my code of the Heidelberg.osm.gz file and run the api-tests with all test passing
  • 9. I have referenced the Issue Number in the Pull Request (if the changes were from an issue).
  • 10. For new features or changes involving building of graphs, I have tested on a larger dataset
    (at least Germany), and the graphs build without problems (i.e. no out-of-memory errors).
  • 11. For new features or changes involving the graphbuilding process (i.e. changing encoders, updating the
    importer etc.), I have generated longer distance routes for the affected profiles with different options
    (avoid features, max weight etc.) and compared these with the routes of the same parameters and start/end
    points generated from the current live ORS.
    If there are differences then the reasoning for these MUST be documented in the pull request.
  • 12. I have written in the Pull Request information about the changes made including their intended usage
    and why the change was needed.
  • 13. For changes touching the API documentation, I have tested that the API playground renders correctly.

Fixes # .

Information about the changes

  • Key functionality added:
  • Reason for change:

Examples and reasons for differences between live ORS routes, and those generated from this pull request

Required changes to ors config (if applicable)

@takb takb added this to To do in ors general Aug 8, 2023
@MichaelsJP MichaelsJP force-pushed the fix/rpmbuild branch 5 times, most recently from 2050fad to 5434f79 Compare August 8, 2023 16:23
@MichaelsJP MichaelsJP changed the title ci: Only trigger on v7.* PRs ci: Fix rpm build Aug 9, 2023
@github-actions github-actions bot added ci 👷 and removed ci 👷 labels Aug 9, 2023
@MichaelsJP MichaelsJP force-pushed the fix/rpmbuild branch 20 times, most recently from 1c94201 to 7e5b14f Compare August 9, 2023 15:35
jhaeu
jhaeu requested changes Aug 10, 2023
View reviewed changes
Copy link
Contributor

@jhaeu jhaeu left a comment

Choose a reason for hiding this comment

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

Excellent, much work! Just some small notes.

.github/workflows/rpm-build.yml Show resolved Hide resolved
.github/workflows/rpm-build.yml Outdated Show resolved Hide resolved
.rpm-packaging/test_rhel8_post_install_check.sh Outdated Show resolved Hide resolved
.rpm-packaging/test_rhel8_pre_install_check.sh Outdated Show resolved Hide resolved
.rpm-packaging/scripts/helper_functions.sh Show resolved Hide resolved
.rpm-packaging/test_rhel8_post_install_check.sh Outdated Show resolved Hide resolved
.rpm-packaging/test_rhel8_post_install_check.sh Outdated Show resolved Hide resolved
.rpm-packaging/ors-war.spec Outdated Show resolved Hide resolved
.rpm-packaging/ors-war.spec Outdated Show resolved Hide resolved
.rpm-packaging/ors-war.spec Show resolved Hide resolved
ors general automation moved this from To do to Review Aug 10, 2023
@MichaelsJP MichaelsJP force-pushed the fix/rpmbuild branch 6 times, most recently from a3cc0ff to ab0d17e Compare August 11, 2023 10:06
@MichaelsJP
refactor(docker): Rename the dockerfile
5b5a8f9
@MichaelsJP
feat(rpm): Add the correct rpm build procedure
4b9a250 
A base script provides abstract check functions.
The three check scripts test the docker container before and after the installation and after removing to ensure that the installation environment is at all times as expected.
The spec file now enforces fixed file permissions.
The github workflow now signs, builds, installs, uninstalls and checks the rpm file at any given point.
@MichaelsJP MichaelsJP requested a review from jhaeu August 11, 2023 11:28
@github-actions github-actions bot added ci 👷 and removed ci 👷 labels Aug 11, 2023
@github-actions github-actions bot added ci 👷 and removed ci 👷 labels Aug 11, 2023
@MichaelsJP MichaelsJP changed the title ci: Fix rpm build feat: Enhance the RPM build Aug 11, 2023
@github-actions github-actions bot added feature and removed ci 👷 labels Aug 11, 2023
MichaelsJP and others added 2 commits August 11, 2023 14:10
@MichaelsJP @jhaeu
fix: Remove the unnecessary ownership check
189fc63 
Co-authored-by: jhaeu <138764906+jhaeu@users.noreply.github.com>
@MichaelsJP
feat(rpm): Allow the environment tests to run through even with faili…
7915f38 
…ng checks

This allows the user to see the complete environment check even if one fails. That should allow for quicker bug fixing.
@MichaelsJP MichaelsJP requested a review from jhaeu August 11, 2023 12:34
@github-actions github-actions bot added feature and removed feature labels Aug 11, 2023
jhaeu
jhaeu approved these changes Aug 11, 2023
View reviewed changes
Copy link
Contributor

@jhaeu jhaeu left a comment

Choose a reason for hiding this comment

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

LGTM

@MichaelsJP MichaelsJP merged commit fd45e0f into v7.2.0 Aug 11, 2023
9 checks passed
ors general automation moved this from Review to Awaiting release Aug 11, 2023
@MichaelsJP MichaelsJP deleted the fix/rpmbuild branch August 11, 2023 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhaeu jhaeu jhaeu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
ors general
  
Awaiting release
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@MichaelsJP @jhaeu