Skip to content

Commit 7356001

Browse files
author
Alex Taylor
committed
Merge remote-tracking branch 'upstream/master' into assertThatIssues
2 parents aba6058 + 14b7bf4 commit 7356001

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ on: [push, pull_request]
66
jobs:
77
build:
88

9-
runs-on: ubuntu-latest
9+
runs-on: ${{ matrix.os }}
1010
strategy:
1111
matrix:
12+
os: [windows-latest, ubuntu-latest]
1213
java: [ '1.8.0', '11.0.x', '13.0.x' ]
1314
steps:
1415
- uses: actions/checkout@v2

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.kohsuke</groupId>
44
<artifactId>github-api</artifactId>
5-
<version>1.106-SNAPSHOT</version>
5+
<version>1.107-SNAPSHOT</version>
66
<name>GitHub API for Java</name>
77
<url>https://github-api.kohsuke.org/</url>
88
<description>GitHub API for Java</description>
@@ -204,6 +204,7 @@
204204
<exclude>org.kohsuke.github.GHPerson.1.1</exclude>
205205

206206
<!-- TODO: These still need test coverage -->
207+
<exclude>org.kohsuke.github.GitHub.GHApiInfo</exclude>
207208
<exclude>org.kohsuke.github.GHBranchProtection.RequiredSignatures</exclude>
208209
<exclude>org.kohsuke.github.GHBranchProtectionBuilder.Restrictions</exclude>
209210
<exclude>org.kohsuke.github.GHBranchProtection.Restrictions</exclude>
@@ -467,7 +468,7 @@
467468
<dependency>
468469
<groupId>commons-io</groupId>
469470
<artifactId>commons-io</artifactId>
470-
<version>2.6</version>
471+
<version>2.4</version>
471472
</dependency>
472473
<dependency>
473474
<groupId>com.infradna.tool</groupId>

src/test/java/org/kohsuke/github/GitHubConnectionTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.kohsuke.github;
22

3+
import org.junit.Ignore;
34
import org.junit.Test;
45

56
import java.io.IOException;
@@ -99,10 +100,11 @@ public void testGithubBuilderWithAppInstallationToken() throws Exception {
99100
assertEquals("", github.login);
100101
}
101102

103+
@Ignore
102104
@Test
103105
public void testGitHubIsApiUrlValid() throws IOException {
104106
GitHub hub = GitHub.connectAnonymously();
105-
// GitHub github = GitHub.connectToEnterpriseAnonymously("https://github.mycompany.com/api/v3/");
107+
// GitHub hub = GitHub.connectToEnterpriseAnonymously(mockGitHub.apiServer().baseUrl());
106108
try {
107109
hub.checkApiUrlValidity();
108110
} catch (IOException ioe) {

0 commit comments

Comments
 (0)