Skip to content

Commit 4b69594

Browse files
artembilangaryrussell
authored andcommitted
Add GH Actions integration
* Remove `.travis.yml` since we rely now on GH Actions for PR checks * Remove all the Travis mentioning when we couldn't pass build because of memory * Fix `Arnaud Cogoluègnes` name in the `@author` list
1 parent 90aee11 commit 4b69594

File tree

6 files changed

+41
-38
lines changed

6 files changed

+41
-38
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Pull Request build
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
services:
13+
rabbitmq:
14+
image: rabbitmq
15+
ports:
16+
- 5672:5672
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Set up JDK 11
22+
uses: actions/setup-java@v1
23+
with:
24+
java-version: 11
25+
26+
- name: Run Gradle
27+
uses: burrunan/gradle-cache-action@v1
28+
with:
29+
arguments: check

.travis.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ plugins {
2727
description = 'Spring AMQP'
2828

2929
ext {
30-
isTravisBuild = System.getenv().get('TRAVIS') == 'true'
3130
linkHomepage = 'https://projects.spring.io/spring-amqp'
3231
linkCi = 'https://build.spring.io/browse/AMQP'
3332
linkIssue = 'https://jira.spring.io/browse/AMQP'
@@ -204,7 +203,7 @@ subprojects { subproject ->
204203
}
205204

206205
task updateCopyrights {
207-
onlyIf { !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') }
206+
onlyIf { !System.getenv('GITHUB_ACTION') && !System.getenv('bamboo_buildKey') }
208207
inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
209208
outputs.dir('build/classes')
210209

@@ -238,10 +237,6 @@ subprojects { subproject ->
238237
jacoco {
239238
destinationFile = file("$buildDir/jacoco.exec")
240239
}
241-
if (isTravisBuild) {
242-
// restrict memory usage, so tests don't fail with exit code 137 on travis
243-
maxHeapSize = '256m'
244-
}
245240
}
246241

247242
task testAll(type: Test, dependsOn: check)

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
*
7676
* @author Gary Russell
7777
* @author Heath Abelson
78-
* @author Arnaud Cogolu?gnes
78+
* @author Arnaud Cogoluègnes
7979
* @author Hareendran
8080
* @author Dominique Villard
8181
* @author Zachary DeLuca

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplatePublisherCallbacksIntegrationTests.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import org.springframework.beans.DirectFieldAccessor;
7878
import org.springframework.expression.Expression;
7979
import org.springframework.expression.spel.standard.SpelExpressionParser;
80-
import org.springframework.test.context.junit.jupiter.DisabledIf;
8180

8281
import com.rabbitmq.client.Channel;
8382
import com.rabbitmq.client.Connection;
@@ -88,7 +87,7 @@
8887
* @author Gunar Hillert
8988
* @author Artem Bilan
9089
* @author Rolf Arne Corneliussen
91-
* @author Arnaud Cogolu?gnes
90+
* @author Arnaud Cogoluègnes
9291
* @since 1.1
9392
*
9493
*/
@@ -384,9 +383,9 @@ public void testPublisherConfirmNotReceivedMultiThreads() throws Exception {
384383
Thread.currentThread().interrupt();
385384
}
386385
template.doSend(channel, "", ROUTE,
387-
new SimpleMessageConverter().toMessage("message", new MessageProperties()),
388-
false,
389-
new CorrelationData("def"));
386+
new SimpleMessageConverter().toMessage("message", new MessageProperties()),
387+
false,
388+
new CorrelationData("def"));
390389
threadSentLatch.countDown();
391390
return null;
392391
}));
@@ -825,14 +824,13 @@ public void testPublisherCallbackChannelImplCloseWithPending() throws Exception
825824
}
826825

827826
@Test
828-
@DisabledIf(expression = "#{systemEnvironment['TRAVIS'] ?: false}", reason = "Overflow needs RabbitMQ 3.7")
829827
public void testWithFuture() throws Exception {
830828
RabbitAdmin admin = new RabbitAdmin(this.connectionFactory);
831829
Queue queue = QueueBuilder.nonDurable()
832-
.autoDelete()
833-
.maxLength(1)
834-
.overflow(Overflow.rejectPublish)
835-
.build();
830+
.autoDelete()
831+
.maxLength(1)
832+
.overflow(Overflow.rejectPublish)
833+
.build();
836834
admin.declareQueue(queue);
837835
CorrelationData cd1 = new CorrelationData();
838836
this.templateWithConfirmsEnabled.convertAndSend("", queue.getName(), "foo", cd1);

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/retry/MissingIdRetryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
/**
6464
* @author Gary Russell
65-
* @author Arnaud Cogolu?gnes
65+
* @author Arnaud Cogoluègnes
6666
* @since 1.1.2
6767
*
6868
*/
@@ -83,7 +83,7 @@ public static void setupAndCleanUp() {
8383
RabbitAvailableCondition.getBrokerRunning().deleteExchanges("retry.test.exchange");
8484
}
8585

86-
@SuppressWarnings({ "rawtypes", "unchecked" })
86+
@SuppressWarnings("rawtypes")
8787
@Test
8888
public void testWithNoId() throws Exception {
8989
// 2 messages; each retried once by missing id interceptor

0 commit comments

Comments
 (0)