Skip to content

Commit 92a86f4

Browse files
bitwisemanbitwiseman
committed
No formatting checks on Windows CI build
1 parent 936a6a0 commit 92a86f4

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ We love getting PRs, but we hate asking people for the same basic changes every
77
- [ ] Push your changes to a branch other than `master`. Create your PR from that branch.
88
- [ ] Add JavaDocs and other comments
99
- [ ] Write tests that run and pass in CI. See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to capture snapshot data.
10-
- [ ] 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.
10+
- [ ] 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.

‎.github/workflows/maven-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
with:
1919
java-version: ${{ matrix.java }}
2020
- name: Maven Download all dependencies
21-
run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline -P ci
21+
run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline -D enable-ci
2222
- name: Maven Build
23-
run: mvn -B install site -P ci --file pom.xml
23+
run: mvn -B install site -D enable-ci --file pom.xml

‎pom.xml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,15 +585,28 @@
585585
</pluginRepositories>
586586
<profiles>
587587
<profile>
588-
<id>ci</id>
588+
<id>ci-non-windows</id>
589589
<activation>
590590
<property>
591591
<name>enable-ci</name>
592592
</property>
593+
<os>
594+
<family>!windows</family>
595+
</os>
593596
</activation>
594597
<properties>
595598
<formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
596-
<!-- <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>-->
599+
<impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
600+
</properties>
601+
</profile>
602+
<profile>
603+
<id>ci-all</id>
604+
<activation>
605+
<property>
606+
<name>enable-ci</name>
607+
</property>
608+
</activation>
609+
<properties>
597610
<jacoco.haltOnFailure>true</jacoco.haltOnFailure>
598611
</properties>
599612
<build>
@@ -613,7 +626,7 @@
613626
<id>release</id>
614627
<properties>
615628
<formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
616-
<!-- <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>-->
629+
<impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
617630
</properties>
618631
<build>
619632
<plugins>

‎src/test/java/org/kohsuke/github/GHOrganizationTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.kohsuke.github;
22

3-
import org.apache.commons.lang3.SystemUtils;
43
import org.junit.After;
54
import org.junit.Assert;
6-
import org.junit.Assume;
75
import org.junit.Before;
86
import org.junit.Test;
97
import org.kohsuke.github.GHOrganization.Permission;

0 commit comments

Comments
 (0)