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

Bugfix/nav 99 fix GitHub actions which are not triggering upon release #61

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Docker publish

on:
push:
tags:
- 'v[0-9]+\.[0-9]+\.[0-9]+(-.*)?'
release:
types: [ created ]

env:
REGISTRY: ghcr.io
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Maven publish

on:
push:
tags:
- 'v[0-9]+\.[0-9]+\.[0-9]+(-.*)?'
release:
types: [ created ]

jobs:
publish:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>
<groupId>ch.naviqore</groupId>
<artifactId>public-transit-service</artifactId>
<version>0.2.0</version>
<version>0.2.1</version>

<name>Public Transit Service</name>
<description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public GtfsToRaptorConverter(GtfsSchedule schedule, int sameStationTransferTime)
this(schedule, List.of(), sameStationTransferTime);
}

public GtfsToRaptorConverter(GtfsSchedule schedule, List<TransferGenerator.Transfer> additionalTransfers, int sameStationTransferTime) {
public GtfsToRaptorConverter(GtfsSchedule schedule, List<TransferGenerator.Transfer> additionalTransfers,
int sameStationTransferTime) {
this.partitioner = new GtfsRoutePartitioner(schedule);
this.additionalTransfers = additionalTransfers;
this.schedule = schedule;
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/ch/naviqore/Benchmark.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/ch/naviqore/raptor/RaptorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Connection> connections = raptor.routeEarliestArrival(STOP_A, STOP_G, EIGHT_AM);

Expand Down