No formatting checks on Windows CI build

hub4j · Jan 30, 2020 · 92a86f4 · 92a86f4
1 parent 936a6a0
commit 92a86f4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,4 +7,4 @@ We love getting PRs, but we hate asking people for the same basic changes every
 - [ ] Push your changes to a branch other than `master`. Create your PR from that branch.    
 - [ ] Add JavaDocs and other comments
 - [ ] Write tests that run and pass in CI. See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to capture snapshot data.
-- [ ] Run `mvn -P ci install site` locally. This may reformat your code, commit those changes. If this command doesn't succeed, your change will not pass CI.
+- [ ] Run `mvn -D enable-ci install site` locally. This may reformat your code, commit those changes. If this command doesn't succeed, your change will not pass CI.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -18,6 +18,6 @@ jobs:
       with:
         java-version: ${{ matrix.java }}
     - name: Maven Download all dependencies
-      run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline -P ci
+      run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline -D enable-ci
     - name: Maven Build
-      run: mvn -B install site -P ci --file pom.xml
+      run: mvn -B install site -D enable-ci --file pom.xml
diff --git a/pom.xml b/pom.xml
@@ -585,15 +585,28 @@
   </pluginRepositories>
   <profiles>
     <profile>
-      <id>ci</id>
+      <id>ci-non-windows</id>
       <activation>
         <property>
           <name>enable-ci</name>
         </property>
+        <os>
+          <family>!windows</family>
+        </os>
       </activation>
       <properties>
         <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
-<!--        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>-->
+        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
+      </properties>
+    </profile>
+    <profile>
+      <id>ci-all</id>
+      <activation>
+        <property>
+          <name>enable-ci</name>
+        </property>
+      </activation>
+      <properties>
         <jacoco.haltOnFailure>true</jacoco.haltOnFailure>
       </properties>
       <build>
@@ -613,7 +626,7 @@
       <id>release</id>
       <properties>
         <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
-<!--        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>-->
+        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
       </properties>
       <build>
         <plugins>

diff --git a/src/test/java/org/kohsuke/github/GHOrganizationTest.java b/src/test/java/org/kohsuke/github/GHOrganizationTest.java
@@ -1,9 +1,7 @@
 package org.kohsuke.github;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.junit.After;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.kohsuke.github.GHOrganization.Permission;