Skip to content

Commit 7b5e450

Browse files
authored
Merge pull request #2409 from hazendaz/master
Cleanup of left over notes on travis-ci - replacing actions properties with similar GITHUB noted setup
2 parents 4ba9fb5 + 096c699 commit 7b5e450

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ jobs:
5555
run: echo 'ARG_LINE=-D"excludedGroups=TestcontainersTests,RequireIllegalAccess"' >> $GITHUB_ENV
5656
- name: Set env command line option
5757
if: ${{ matrix.os == 'ubuntu-latest' }}
58-
run: echo 'ENV_TRAVIS="-Denv.TRAVIS"' >> $GITHUB_ENV
58+
run: echo 'ENV_GITHUB="-Denv.GITHUB"' >> $GITHUB_ENV
5959
- name: Test with Maven
6060
if: ${{ matrix.os != 'windows-latest' }}
61-
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ENV_TRAVIS $ARG_LINE
61+
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ENV_GITHUB $ARG_LINE
6262
- name: Test with Maven
6363
if: ${{ matrix.os == 'windows-latest' && (matrix.java == '8')}}
6464
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true"

pom.xml

+5-14
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<url>https://github.com/mybatis/mybatis-3/issues</url>
120120
</issueManagement>
121121
<ciManagement>
122-
<system>Travis CI</system>
123-
<url>https://travis-ci.org/mybatis/mybatis-3/</url>
122+
<system>Github</system>
123+
<url>https://github.com/mybatis/mybatis-3/actions</url>
124124
</ciManagement>
125125
<distributionManagement>
126126
<site>
@@ -397,11 +397,11 @@
397397

398398
<profiles>
399399
<profile>
400-
<!-- Run slow tests only on travis ci, to force run otherwise use -D"env.TRAVIS" -->
401-
<id>travis-ci</id>
400+
<!-- Run slow tests only on github ci, to force run otherwise use -D"env.GITHUB" -->
401+
<id>github-ci</id>
402402
<activation>
403403
<property>
404-
<name>env.TRAVIS</name>
404+
<name>env.GITHUB</name>
405405
</property>
406406
</activation>
407407
<properties>
@@ -410,13 +410,4 @@
410410
</profile>
411411
</profiles>
412412

413-
<!-- Will remove after released mybatis-parent 32+ (See https://github.com/mybatis/mybatis-3/issues/1926) -->
414-
<repositories>
415-
<repository>
416-
<id>sonatype-oss-snapshots</id>
417-
<name>Sonatype OSS Snapshots Repository</name>
418-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
419-
</repository>
420-
</repositories>
421-
422413
</project>

src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void shallNotInterpolateSkippedVaiables() {
8686
assertEquals("The null is ${skipped} variable", parser.parse("The ${skipped} is \\${skipped} variable"));
8787
}
8888

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

0 commit comments

Comments
 (0)