From 632b7c9a7a30efe7c9b0ffb1625fa0e70b5b9f97 Mon Sep 17 00:00:00 2001 From: Merlin Unterfinger Date: Wed, 12 Jun 2024 10:47:08 +0200 Subject: [PATCH 1/4] FIX: NAV-99 - Trigger maven-publish.yml upon release --- .github/workflows/maven-publish.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9e2a5ca2..034cb09a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,9 +1,8 @@ name: Maven publish on: - push: - tags: - - 'v[0-9]+\.[0-9]+\.[0-9]+(-.*)?' + release: + types: [created] jobs: publish: From 39714d4f378d80ac56642aaa7982aef01e0d9d84 Mon Sep 17 00:00:00 2001 From: Merlin Unterfinger Date: Wed, 12 Jun 2024 10:47:15 +0200 Subject: [PATCH 2/4] FIX: NAV-99 - Trigger docker-publish.yml upon release --- .github/workflows/docker-publish.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 553e75ab..e29fc069 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,9 +1,8 @@ name: Docker publish on: - push: - tags: - - 'v[0-9]+\.[0-9]+\.[0-9]+(-.*)?' + release: + types: [created] env: REGISTRY: ghcr.io From 3f5f7ee7d527463661a08326dc14a10239dc74be Mon Sep 17 00:00:00 2001 From: Merlin Unterfinger Date: Wed, 12 Jun 2024 10:47:32 +0200 Subject: [PATCH 3/4] FIX: NAV-99 - Patch version bump to v0.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index def6395a..3a052371 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ ch.naviqore public-transit-service - 0.2.0 + 0.2.1 Public Transit Service From 086c8a8682d2776a196dbda4361c961a89207195 Mon Sep 17 00:00:00 2001 From: Merlin Unterfinger Date: Wed, 12 Jun 2024 10:48:34 +0200 Subject: [PATCH 4/4] STYLE: NAV-99 - Format project --- .github/workflows/docker-publish.yml | 2 +- .github/workflows/maven-publish.yml | 2 +- .../naviqore/service/impl/convert/GtfsToRaptorConverter.java | 3 ++- src/test/java/ch/naviqore/Benchmark.java | 3 ++- src/test/java/ch/naviqore/raptor/RaptorTest.java | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index e29fc069..fdf6e003 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -2,7 +2,7 @@ name: Docker publish on: release: - types: [created] + types: [ created ] env: REGISTRY: ghcr.io diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 034cb09a..1aae12f7 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -2,7 +2,7 @@ name: Maven publish on: release: - types: [created] + types: [ created ] jobs: publish: diff --git a/src/main/java/ch/naviqore/service/impl/convert/GtfsToRaptorConverter.java b/src/main/java/ch/naviqore/service/impl/convert/GtfsToRaptorConverter.java index 4644064f..0f427ceb 100644 --- a/src/main/java/ch/naviqore/service/impl/convert/GtfsToRaptorConverter.java +++ b/src/main/java/ch/naviqore/service/impl/convert/GtfsToRaptorConverter.java @@ -36,7 +36,8 @@ public GtfsToRaptorConverter(GtfsSchedule schedule, int sameStationTransferTime) this(schedule, List.of(), sameStationTransferTime); } - public GtfsToRaptorConverter(GtfsSchedule schedule, List additionalTransfers, int sameStationTransferTime) { + public GtfsToRaptorConverter(GtfsSchedule schedule, List additionalTransfers, + int sameStationTransferTime) { this.partitioner = new GtfsRoutePartitioner(schedule); this.additionalTransfers = additionalTransfers; this.schedule = schedule; diff --git a/src/test/java/ch/naviqore/Benchmark.java b/src/test/java/ch/naviqore/Benchmark.java index 5df6c6fd..69d88621 100644 --- a/src/test/java/ch/naviqore/Benchmark.java +++ b/src/test/java/ch/naviqore/Benchmark.java @@ -97,7 +97,8 @@ private static Raptor initializeRaptor(GtfsSchedule schedule) throws Interrupted SAME_STATION_TRANSFER_TIME); additionalGeneratedTransfers.addAll(sameStationTransferGenerator.generateTransfers(schedule)); - Raptor raptor = new GtfsToRaptorConverter(schedule, additionalGeneratedTransfers, SAME_STATION_TRANSFER_TIME).convert(SCHEDULE_DATE); + Raptor raptor = new GtfsToRaptorConverter(schedule, additionalGeneratedTransfers, + SAME_STATION_TRANSFER_TIME).convert(SCHEDULE_DATE); manageResources(); return raptor; } diff --git a/src/test/java/ch/naviqore/raptor/RaptorTest.java b/src/test/java/ch/naviqore/raptor/RaptorTest.java index cf66a2c7..82d22f97 100644 --- a/src/test/java/ch/naviqore/raptor/RaptorTest.java +++ b/src/test/java/ch/naviqore/raptor/RaptorTest.java @@ -203,8 +203,7 @@ void takeFasterRouteOfOverlappingRoutes(RaptorTestBuilder builder) { void takeSlowerRouteOfOverlappingRoutesDueToEarlierDepartureTime(RaptorTestBuilder builder) { // Create Two Versions of the same route with different travel speeds and different departure times Raptor raptor = builder.withAddRoute1_AG() - .withAddRoute1_AG("R1X", 15, 30, 3, - RaptorTestBuilder.DEFAULT_DWELL_TIME) + .withAddRoute1_AG("R1X", 15, 30, 3, RaptorTestBuilder.DEFAULT_DWELL_TIME) .build(); List connections = raptor.routeEarliestArrival(STOP_A, STOP_G, EIGHT_AM);