Skip to content

Commit bccb7a5

Browse files
abyrdabyrd
committed
replace TravisCI with GH actions and packages
Remove OSSRH deployment. Remove GPG signing and POM metadata that we included to satisfy OSSRH requirements.
1 parent fb5ef51 commit bccb7a5

File tree

6 files changed

+52
-182
lines changed

6 files changed

+52
-182
lines changed

‎.github/workflows/cibuild.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: OTP CI Build
2+
# On [push, pull_request] causes double-builds when creating PRs.
3+
# But triggering on push only will miss pull requests from outside authors.
4+
# The push event's ref is the name of the pushed branch;
5+
# The pull_request event's branch name is the merge target branch.
6+
on:
7+
push:
8+
branches:
9+
- master
10+
- dev-1.x
11+
- dev-2.x
12+
pull_request:
13+
branches:
14+
- master
15+
- dev-1.x
16+
- dev-2.x
17+
jobs:
18+
build:
19+
runs-on: ubuntu-latest
20+
steps:
21+
# Starting in v2.2 checkout action fetches all tags when fetch-depth=0, for auto-versioning.
22+
- uses: actions/[email protected]
23+
with:
24+
fetch-depth: 0
25+
# Java setup step completes very fast, no need to run in a preconfigured docker container
26+
- name: Set up JDK 11
27+
uses: actions/setup-java@v1
28+
with:
29+
java-version: 11
30+
- uses: actions/cache@v2
31+
id: cache
32+
with:
33+
path: ~/.m2
34+
key: maven-local-repo
35+
- name: Build and Test
36+
run: mvn --batch-mode --update-snapshots verify
37+
- name: Deploy to Github Package Registry
38+
# if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x')
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
run: mvn --batch-mode deploy --settings maven-settings.xml -DskipTests

‎.travis.yml

-61
This file was deleted.

‎docs/javadoc/README.md

-19
This file was deleted.

‎maven-artifact-signing-key.asc.enc

-5.61 KB
Binary file not shown.

‎maven-settings.xml

+6-19
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
1-
<!-- This file provides passwords and key details to the Maven plugins that sign our artifacts
2-
and deploy them to the OSSRH repository. The secret information is passed in with
3-
Travis CI secure environment variables in .travis.yml. -->
1+
<!-- This file provides credentials and other details to the Maven plugins that deploy our artifacts.
2+
These are provided with Github repo secrets (and secrets.GITHUB_TOKEN is provided automatically).
3+
Those secrets are copied to environment variables by the CI Action. -->
44
<settings>
55
<servers>
66
<server>
7-
<id>ossrh</id>
8-
<username>${env.OSSRH_JIRA_USERNAME}</username>
9-
<password>${env.OSSRH_JIRA_PASSWORD}</password>
7+
<id>github</id>
8+
<username>NONE</username>
9+
<password>${env.GITHUB_TOKEN}</password>
1010
</server>
1111
</servers>
12-
<profiles>
13-
<profile>
14-
<id>ossrh</id>
15-
<activation>
16-
<activeByDefault>true</activeByDefault>
17-
</activation>
18-
<properties>
19-
<gpg.executable>gpg</gpg.executable>
20-
<gpg.keyname>${env.GPG_KEY_NAME}</gpg.keyname>
21-
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
22-
</properties>
23-
</profile>
24-
</profiles>
2512
</settings>
2613

‎pom.xml

+5-83
Original file line numberDiff line numberDiff line change
@@ -17,50 +17,7 @@
1717
</license>
1818
</licenses>
1919

20-
<!-- Developer entries are provided for only first six contributors on the Github stats page for to the 2.x branch.
21-
For other contributors, see https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors -->
22-
<developers>
23-
<developer>
24-
<name>Andrew Byrd</name>
25-
<email>[email protected]</email>
26-
<organization>Conveyal</organization>
27-
<organizationUrl>http://conveyal.com/</organizationUrl>
28-
</developer>
29-
<developer>
30-
<name>Matt Conway</name>
31-
<email>[email protected]</email>
32-
<organization>Conveyal</organization>
33-
<organizationUrl>http://conveyal.com/</organizationUrl>
34-
</developer>
35-
<developer>
36-
<name>Thomas Gran</name>
37-
<email>[email protected]</email>
38-
<organization>Ruter and Entur</organization>
39-
<organizationUrl>http://entur.org/</organizationUrl>
40-
</developer>
41-
<developer>
42-
<name>Laurent Grégoire</name>
43-
<email>[email protected]</email>
44-
<organization>Mecatran</organization>
45-
<organizationUrl>http://www.mecatran.com/</organizationUrl>
46-
</developer>
47-
<developer>
48-
<name>Gard Mellemstrand</name>
49-
<email>[email protected]</email>
50-
<organization>Entur</organization>
51-
<organizationUrl>http://entur.org/</organizationUrl>
52-
</developer>
53-
<developer>
54-
<name>David Novalis Turner</name>
55-
<email>[email protected]</email>
56-
<organization>Ex-OpenPlans</organization>
57-
<organizationUrl>http://openplans.org/</organizationUrl>
58-
</developer>
59-
</developers>
60-
6120
<scm>
62-
<connection>scm:git:http://github.com/opentripplanner/OpenTripPlanner.git</connection>
63-
<developerConnection>scm:git:ssh://[email protected]/opentripplanner/OpenTripPlanner.git</developerConnection>
6421
<url>http://github.com/opentripplanner/OpenTripPlanner</url>
6522
</scm>
6623

@@ -75,12 +32,11 @@
7532
</properties>
7633

7734
<distributionManagement>
78-
<!-- We are using Sonatype Nexus Staging instead of Maven Release plugin.
79-
Only a snapshot repo should be configured. Releases are done from that snapshot staging repo. -->
80-
<snapshotRepository>
81-
<id>ossrh</id>
82-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
83-
</snapshotRepository>
35+
<repository>
36+
<id>github</id>
37+
<name>OpenTripPlanner Maven Repository on Github Packages</name>
38+
<url>https://maven.pkg.github.com/opentripplanner/OpenTripPlanner/</url>
39+
</repository>
8440
</distributionManagement>
8541

8642
<build>
@@ -203,18 +159,6 @@
203159
</execution>
204160
</executions>
205161
</plugin>
206-
<plugin>
207-
<!-- Recommended way to deploy to OSSRH , which allows deferred manual release to Central. -->
208-
<groupId>org.sonatype.plugins</groupId>
209-
<artifactId>nexus-staging-maven-plugin</artifactId>
210-
<version>1.6.7</version>
211-
<extensions>true</extensions>
212-
<configuration>
213-
<serverId>ossrh</serverId>
214-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
215-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
216-
</configuration>
217-
</plugin>
218162
<plugin>
219163
<groupId>com.webcohesion.enunciate</groupId>
220164
<artifactId>enunciate-maven-plugin</artifactId>
@@ -232,13 +176,6 @@
232176
<docsDir>${project.build.directory}/site/enunciate</docsDir>
233177
</configuration>
234178
</plugin>
235-
<plugin>
236-
<!-- OTP includes an empty javadoc.jar file. See docs/javadoc/README.md -->
237-
<groupId>org.apache.maven.plugins</groupId>
238-
<artifactId>maven-javadoc-plugin</artifactId>
239-
<version>3.2.0</version>
240-
<configuration><skip>true</skip></configuration>
241-
</plugin>
242179
<plugin>
243180
<groupId>org.apache.maven.plugins</groupId>
244181
<artifactId>maven-source-plugin</artifactId>
@@ -285,21 +222,6 @@
285222
</execution>
286223
</executions>
287224
</plugin>
288-
<plugin>
289-
<groupId>org.apache.maven.plugins</groupId>
290-
<artifactId>maven-gpg-plugin</artifactId>
291-
<version>1.5</version>
292-
<executions>
293-
<execution>
294-
<id>sign-artifacts</id>
295-
<!-- We sign in the verify phase, which means it will happen for install and deploy but not package. -->
296-
<phase>verify</phase>
297-
<goals>
298-
<goal>sign</goal>
299-
</goals>
300-
</execution>
301-
</executions>
302-
</plugin>
303225
<plugin>
304226
<groupId>org.apache.maven.plugins</groupId>
305227
<artifactId>maven-surefire-plugin</artifactId>

0 commit comments

Comments
 (0)