Skip to content

Commit

Permalink
Merge pull request #2409 from hazendaz/master
Browse files Browse the repository at this point in the history
Cleanup of left over notes on travis-ci - replacing actions properties with similar GITHUB noted setup
  • Loading branch information
hazendaz committed Dec 21, 2021
2 parents 4ba9fb5 + 096c699 commit 7b5e450
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ jobs:
run: echo 'ARG_LINE=-D"excludedGroups=TestcontainersTests,RequireIllegalAccess"' >> $GITHUB_ENV
- name: Set env command line option
if: ${{ matrix.os == 'ubuntu-latest' }}
run: echo 'ENV_TRAVIS="-Denv.TRAVIS"' >> $GITHUB_ENV
run: echo 'ENV_GITHUB="-Denv.GITHUB"' >> $GITHUB_ENV
- name: Test with Maven
if: ${{ matrix.os != 'windows-latest' }}
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ENV_TRAVIS $ARG_LINE
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ENV_GITHUB $ARG_LINE
- name: Test with Maven
if: ${{ matrix.os == 'windows-latest' && (matrix.java == '8')}}
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true"
Expand Down
19 changes: 5 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
<url>https://github.com/mybatis/mybatis-3/issues</url>
</issueManagement>
<ciManagement>
<system>Travis CI</system>
<url>https://travis-ci.org/mybatis/mybatis-3/</url>
<system>Github</system>
<url>https://github.com/mybatis/mybatis-3/actions</url>
</ciManagement>
<distributionManagement>
<site>
Expand Down Expand Up @@ -397,11 +397,11 @@

<profiles>
<profile>
<!-- Run slow tests only on travis ci, to force run otherwise use -D"env.TRAVIS" -->
<id>travis-ci</id>
<!-- Run slow tests only on github ci, to force run otherwise use -D"env.GITHUB" -->
<id>github-ci</id>
<activation>
<property>
<name>env.TRAVIS</name>
<name>env.GITHUB</name>
</property>
</activation>
<properties>
Expand All @@ -410,13 +410,4 @@
</profile>
</profiles>

<!-- Will remove after released mybatis-parent 32+ (See https://github.com/mybatis/mybatis-3/issues/1926) -->
<repositories>
<repository>
<id>sonatype-oss-snapshots</id>
<name>Sonatype OSS Snapshots Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void shallNotInterpolateSkippedVaiables() {
assertEquals("The null is ${skipped} variable", parser.parse("The ${skipped} is \\${skipped} variable"));
}

@Disabled("Because it randomly fails on Travis CI. It could be useful during development.")
@Disabled("Because it randomly fails on Github CI. It could be useful during development.")
@Test
void shouldParseFastOnJdk7u6() {
Assertions.assertTimeout(Duration.ofMillis(1000), () -> {
Expand Down

0 comments on commit 7b5e450

Please sign in to comment.