diff --git a/.github/workflows/project_automation.yml b/.github/workflows/project_automation.yml index 868c7e706e..66a16d1c1b 100644 --- a/.github/workflows/project_automation.yml +++ b/.github/workflows/project_automation.yml @@ -12,11 +12,15 @@ jobs: Handle_event: runs-on: ubuntu-latest steps: - - uses: takb/project-board@master + - name: run project board action + uses: takb/project-board@master + env: + PROJECT_AUTOMATION: ${{ secrets.PROJECT_AUTOMATION }} + if: env.PROJECT_AUTOMATION != null with: token: "${{ secrets.PROJECT_AUTOMATION }}" owner: "GIScience" repo: "openrouteservice" project: "16" columnbylabel: '{":bug: bug": "Priority"}' - ignorecolumnnames: "Priority,Assigned,In progress,Review,Awaiting release,Done" \ No newline at end of file + ignorecolumnnames: "Priority,Assigned,In progress,Review,Awaiting release,Done" diff --git a/.github/workflows/run_maven_tests.yml b/.github/workflows/run_maven_tests.yml index ba788447b0..6d887df1e4 100644 --- a/.github/workflows/run_maven_tests.yml +++ b/.github/workflows/run_maven_tests.yml @@ -41,5 +41,6 @@ jobs: with: type: ${{ job.status }} job_name: '*ORS CI Test*' - commit: true +# this does not work. https://github.com/GIScience/openrouteservice/runs/1648312213?check_suite_focus=true +# commit: false token: ${{ secrets.PROJECT_AUTOMATION }} diff --git a/.gitignore b/.gitignore index a28f4bd14c..21a2cfa864 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,9 @@ openrouteservice/src/main/resources/app.config* docker/elevation_cache docker/conf +# Ignore ors.run file +*ors.run + app.config.local cgiar_provider/ graphs/ diff --git a/CHANGELOG.md b/CHANGELOG.md index ba81082e14..292b62375c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ RELEASING: --> ## [Unreleased] +### Added +- output run file to signal completion of graph building/loading at init time ### Fixed - Define behavior for first container start with existing app.config diff --git a/openrouteservice/src/main/java/org/heigit/ors/routing/RoutingProfileManager.java b/openrouteservice/src/main/java/org/heigit/ors/routing/RoutingProfileManager.java index 149967c262..3362a77c35 100644 --- a/openrouteservice/src/main/java/org/heigit/ors/routing/RoutingProfileManager.java +++ b/openrouteservice/src/main/java/org/heigit/ors/routing/RoutingProfileManager.java @@ -625,12 +625,12 @@ public MatrixResult computeMatrix(MatrixRequest req) throws Exception { } public void createRunFile() { - File file=new File("ors.run"); + File file = new File("ors.run"); try (FileWriter fw = new FileWriter(file)) { fw.write("ORS init complete: "+ Instant.now().toString() + "\n"); fw.flush(); - } catch(IOException ex) { - ex.printStackTrace(); + } catch(Exception ex) { + LOGGER.warn("Failed to write ors.run file, this might cause problems with automated testing."); } } }