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

build(maven): Fix the docker-build pipeline #1693

Merged
merged 2 commits into from
Feb 19, 2024
Merged

Conversation

MichaelsJP
Copy link
Member

This PR moves the war/jar logic to the main pom.xml. This allows us to use the packagingValue inside the ors-report-aggregation as well and build it in jar/war mode. Before, we always needed to exclude the package when building with war target.

Pull Request Checklist

  • 1. I have rebased the latest version of the main 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)

@MichaelsJP MichaelsJP force-pushed the fix/docker-build-pipeline branch from 9cbadb4 to eec874b Compare February 19, 2024 09:13
@github-actions github-actions bot added the build label Feb 19, 2024
@MichaelsJP MichaelsJP marked this pull request as draft February 19, 2024 09:30
This allows us to use the packagingValue inside the ors-report-aggregation as well and build it in jar/war mode. Before, we always needed to exclude the package when building with war target.
@MichaelsJP MichaelsJP force-pushed the fix/docker-build-pipeline branch from eec874b to dcf0497 Compare February 19, 2024 09:34
@MichaelsJP MichaelsJP marked this pull request as ready for review February 19, 2024 09:53
@github-actions github-actions bot added build and removed build labels Feb 19, 2024
This updates docker/setup-qemu-action@v2 to docker/setup-qemu-action@v3. This brings speed improvements!
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

@jhaeu jhaeu merged commit 057625a into main Feb 19, 2024
15 checks passed
@jhaeu jhaeu deleted the fix/docker-build-pipeline branch February 19, 2024 10:39
@MichaelsJP MichaelsJP added this to the V8 Release milestone Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Status: Awaiting release
Development

Successfully merging this pull request may close these issues.

2 participants