Skip to content

Commit 6b52f42

Browse files
committed
chore: Remove travis; add cirrus ci.
We still need a GitHub workflow to test the sbt build. For now, we only test toktok-stack and the bazel build.
1 parent 50d9a6b commit 6b52f42

File tree

17 files changed

+75
-124
lines changed

17 files changed

+75
-124
lines changed

.cirrus.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
cirrus-ci_task:
3+
container:
4+
image: toxchat/toktok-stack:0.0.12
5+
cpu: 2
6+
memory: 6G
7+
configure_script:
8+
- /src/workspace/tools/inject-repo jvm-toxcore-c
9+
test_all_script:
10+
- TEST="bazel test -k
11+
--remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
12+
--config=release
13+
//jvm-toxcore-c/..."
14+
- $TEST || $TEST || $TEST || $TEST

.github/settings.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
_extends: template
2+
_extends: .github
33

44
repository:
55
name: jvm-toxcore-c
@@ -12,10 +12,6 @@ branches:
1212
protection:
1313
required_status_checks:
1414
contexts:
15-
- Codacy/PR Quality Review
16-
- CodeFactor
17-
- Travis CI - Pull Request
18-
- WIP
15+
- cirrus-ci
16+
- Codacy Static Code Analysis
1917
- code-review/reviewable
20-
- coverage/coveralls
21-
- license/cla

.travis.yml

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

BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ scala_library(
196196
"@maven//:com_typesafe_scala_logging_scala_logging_2_11",
197197
"@maven//:org_jetbrains_annotations",
198198
"@maven//:org_scalacheck_scalacheck_2_11",
199+
"@maven//:org_scalatestplus_scalacheck_1_14_2_11",
199200
"@maven//:org_slf4j_slf4j_api",
200201
],
201202
)
@@ -226,6 +227,7 @@ scala_library(
226227
"@maven//:org_apache_commons_commons_lang3",
227228
"@maven//:org_jetbrains_annotations",
228229
"@maven//:org_scalacheck_scalacheck_2_11",
230+
"@maven//:org_scalatestplus_scalacheck_1_14_2_11",
229231
"@maven//:org_slf4j_slf4j_api",
230232
],
231233
) for src in glob(["src/test/java/**/*Test.scala"])]
@@ -248,6 +250,7 @@ scala_library(
248250
"//jvm-toxcore-api",
249251
"@io_bazel_rules_scala//scala/scalatest",
250252
"@maven//:junit_junit",
253+
"@maven//:org_scalatestplus_junit_4_13_2_11",
251254
"@maven//:org_slf4j_slf4j_api",
252255
],
253256
) for src in glob(["src/test/java/**/*.java"])]

src/test/java/im/tox/core/random/RandomCoreTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package im.tox.core.random
22

33
import org.scalacheck.Gen
44
import org.scalatest.WordSpec
5-
import org.scalatest.prop.PropertyChecks
5+
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
66

77
@SuppressWarnings(Array("org.wartremover.warts.Equals"))
8-
final class RandomCoreTest extends WordSpec with PropertyChecks {
8+
final class RandomCoreTest extends WordSpec with ScalaCheckPropertyChecks {
99

1010
"entropy" should {
1111
"be 0 for the empty sequence" in {

src/test/java/im/tox/tox4j/av/callbacks/AvInvokeTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import im.tox.tox4j.impl.jni.{ ToxAvImpl, ToxCoreImpl }
1313
import org.scalacheck.Arbitrary.arbitrary
1414
import org.scalacheck.{ Arbitrary, Gen }
1515
import org.scalatest.FunSuite
16-
import org.scalatest.prop.PropertyChecks
16+
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
1717

1818
import scala.collection.JavaConverters._
1919
import scala.language.implicitConversions
2020
import scala.util.Random
2121

22-
final class AvInvokeTest extends FunSuite with PropertyChecks {
22+
final class AvInvokeTest extends FunSuite with ScalaCheckPropertyChecks {
2323

2424
final class TestEventListener extends ToxAvEventListener[Option[Event]] {
2525
private def setEvent(event: Event)(state: Option[Event]): Option[Event] = {

src/test/java/im/tox/tox4j/core/JToxCoreTest.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package im.tox.tox4j.core;
22

3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertNotNull;
5+
36
import im.tox.tox4j.core.callbacks.ToxCoreEventAdapter;
47
import im.tox.tox4j.core.callbacks.ToxCoreEventListener;
58
import im.tox.tox4j.core.enums.ToxFileControl;
@@ -13,24 +16,18 @@
1316
import im.tox.tox4j.impl.jni.ToxCoreImpl;
1417
import org.junit.Assert;
1518
import org.junit.Test;
16-
import org.scalatest.junit.JUnitSuite;
17-
18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertNotNull;
19+
import org.scalatestplus.junit.JUnitSuite;
2020

2121
public final class JToxCoreTest extends JUnitSuite {
2222

23-
private final ToxCoreEventListener<Void> handler = new ToxCoreEventAdapter<>();
23+
private final ToxCoreEventListener<Void> handler =
24+
new ToxCoreEventAdapter<>();
25+
2426
private final ToxOptions options = new ToxOptions(
25-
true, true, true,
26-
new ProxyOptions.Http("localhost", 1234),
27-
ToxCoreConstants.DefaultStartPort(),
28-
ToxCoreConstants.DefaultEndPort(),
29-
0,
27+
true, true, true, new ProxyOptions.Http("localhost", 1234),
28+
ToxCoreConstants.DefaultStartPort(), ToxCoreConstants.DefaultEndPort(), 0,
3029
// TODO(iphydf): This is kind of ugly. Do we want to live with this?
31-
SaveDataOptions.None$.MODULE$,
32-
true
33-
);
30+
SaveDataOptions.None$.MODULE$, true);
3431

3532
private void expectBoolean(boolean bool) {}
3633

@@ -102,5 +99,4 @@ public void testJavaApi() {
10299
assertNotNull(e);
103100
}
104101
}
105-
106102
}

src/test/java/im/tox/tox4j/core/NetworkTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import im.tox.tox4j.core.NetworkTest.logger
88
import im.tox.tox4j.core.data.ToxPublicKey
99
import im.tox.tox4j.impl.jni.ToxCoreImplFactory.{ withToxUnit, withToxes }
1010
import org.scalatest.FlatSpec
11-
import org.scalatest.concurrent.Timeouts
11+
import org.scalatest.concurrent.TimeLimits
1212
import org.slf4j.LoggerFactory
1313

1414
import scala.language.postfixOps
@@ -19,7 +19,7 @@ object NetworkTest {
1919
}
2020

2121
@SuppressWarnings(Array("org.wartremover.warts.While"))
22-
final class NetworkTest extends FlatSpec with Timeouts {
22+
final class NetworkTest extends FlatSpec with TimeLimits {
2323

2424
// TODO(iphydf): Figure out why the bootstrap tests all fail on Travis.
2525
/*

src/test/java/im/tox/tox4j/core/ToxCoreTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import im.tox.tox4j.impl.jni.ToxCoreImpl
88
import im.tox.tox4j.impl.jni.ToxCoreImplFactory.withToxUnit
99
import im.tox.tox4j.testing.GetDisjunction._
1010
import org.scalatest.FlatSpec
11-
import org.scalatest.prop.PropertyChecks
11+
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
1212

1313
@SuppressWarnings(Array("org.wartremover.warts.Equals"))
14-
final class ToxCoreTest extends FlatSpec with PropertyChecks {
14+
final class ToxCoreTest extends FlatSpec with ScalaCheckPropertyChecks {
1515

1616
"addFriend" should "return increasing friend numbers and increment the friend list size" in {
1717
forAll { (count: SmallNat, message: Array[Byte]) =>

src/test/java/im/tox/tox4j/core/callbacks/CoreInvokeTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import im.tox.tox4j.testing.GetDisjunction._
1010
import org.scalacheck.Arbitrary.arbitrary
1111
import org.scalacheck.{ Arbitrary, Gen }
1212
import org.scalatest.FunSuite
13-
import org.scalatest.prop.PropertyChecks
13+
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
1414

1515
import scala.language.implicitConversions
1616
import scala.util.Random
1717

18-
final class CoreInvokeTest extends FunSuite with PropertyChecks {
18+
final class CoreInvokeTest extends FunSuite with ScalaCheckPropertyChecks {
1919

2020
final class TestEventListener extends ToxCoreEventListener[Option[Event]] {
2121
private def setEvent(event: Event)(state: Option[Event]): Option[Event] = {

0 commit comments

Comments
 (0)