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

fix: Repair the docker workflow #1904

Merged
merged 8 commits into from
Nov 25, 2024

Conversation

MichaelsJP
Copy link
Member

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)

@github-actions github-actions bot added the fix label Nov 22, 2024
@MichaelsJP MichaelsJP marked this pull request as draft November 22, 2024 19:59
@MichaelsJP MichaelsJP force-pushed the fix/repair-docker-workflow branch 12 times, most recently from 4b2607c to 87e8967 Compare November 24, 2024 17:06
@MichaelsJP MichaelsJP force-pushed the fix/repair-docker-workflow branch from 87e8967 to fcce93c Compare November 24, 2024 17:44
MichaelsJP and others added 5 commits November 24, 2024 18:49
The docker setup is broken since the config migration and other changes.
This also adds a health check of the container at the default port 8082.
This also removes the old config migration notice. The notice is not necessary anymore for the next release.
…CLI errors

project.basedir is not reliably resolving the correct folder in a multi module project. Instead introduce maven.multiModuleProjectDirectory.
Additionally, maven-resources-plugin is having issues in 3.0.2 in the sonar workflow. 3.3.1 seems to be resolved.
This also removes a complete redundant test execution.
The cache sequences were still downloading in the wrong order.
Additionally, the integration tests builder did not properly cache its maven dependencies during CI runs.
@MichaelsJP MichaelsJP force-pushed the fix/repair-docker-workflow branch from fcce93c to b385f7b Compare November 24, 2024 17:49
@MichaelsJP MichaelsJP marked this pull request as ready for review November 24, 2024 17:56
@MichaelsJP MichaelsJP requested a review from jhaeu November 24, 2024 17:56
@github-actions github-actions bot added fix and removed fix labels Nov 24, 2024
@MichaelsJP MichaelsJP changed the title fix: Repair docker workflow fix: Repair the docker workflow Nov 24, 2024
@github-actions github-actions bot added fix and removed fix labels Nov 24, 2024
@github-actions github-actions bot added the fix label Nov 24, 2024
@MichaelsJP MichaelsJP force-pushed the fix/repair-docker-workflow branch 14 times, most recently from b05ca8d to 7f0d534 Compare November 24, 2024 21:52
The docker setup is broken since the config migration and other changes.
This also adds a health check of the container at the default port 8082.
This also removes the old config migration notice. The notice is not necessary anymore for the next release.
@MichaelsJP MichaelsJP force-pushed the fix/repair-docker-workflow branch from e0cd2c6 to 2c9b937 Compare November 24, 2024 22:06
@MichaelsJP MichaelsJP requested review from koebi and removed request for jhaeu November 25, 2024 09:03
@github-actions github-actions bot added fix and removed fix labels Nov 25, 2024
We ensure test stability across graph reloads with this.
Copy link
Collaborator

@koebi koebi left a comment

Choose a reason for hiding this comment

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

LGTM, nice work!

@koebi koebi merged commit bf2e29c into feat/graph-repo-client Nov 25, 2024
10 checks passed
@koebi koebi deleted the fix/repair-docker-workflow branch November 25, 2024 10:37
@koebi koebi restored the fix/repair-docker-workflow branch November 25, 2024 10:37
@koebi koebi deleted the fix/repair-docker-workflow branch November 25, 2024 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants