Skip to content

Commit 1af0b41

Browse files
plexusbbatsov
authored andcommitted
Following Clojure 1.10 release, add :1.10 profile, use :master 1.11
Now that Clojure 1.10 is out, add an extra Leiningen profile to test with, and switch the the `:master` profile to use the `1.11.0-master-SNAPSHOT` version. Run CI on Clojure 1.8/1.9/1.10/master and oraclejdk8/openjdk11.
1 parent 95330e3 commit 1af0b41

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

.travis.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ env:
1212
- CLOJURE_VERSION=1.8 TARGET=test-cljs
1313
- CLOJURE_VERSION=1.9 TARGET=test-clj
1414
- CLOJURE_VERSION=1.9 TARGET=test-cljs
15+
- CLOJURE_VERSION=1.10 TARGET=test-clj
16+
- CLOJURE_VERSION=1.10 TARGET=test-cljs
1517
global:
1618
- secure: "bCp4gU7XgeqLnqKwEpJarnKPbGljHyLE2rZnub4mEHD8kcvh6LoEkG/2QCtnSETj8zrQJwyMuEDGUwPgjmzQ/aEn6UiIYmv7ka6QnLBxOxhqQTbDtG7HssfkeT5b67LgOyQX7ejK88vnmH+OeWXM7kOOvUwVy5BVgsYyr2f1cGU="
1719
- secure: "D2Ie7dUZ9nQOIWtkRl2XWZeijSL8expUXP3GziSqQV1scJzwexxnUsRvWOkc2YU8+6IIGz9tcyt9RrEFUVF31VZgRSHh8P5rGGCzI2l99djKhYFfSErElwgoAJZFtOzougZK66/Gtb5uDo5L/wlKHkl4st3miqm+mEvfJITDjRQ="
@@ -32,30 +34,30 @@ stages:
3234
jobs:
3335
include:
3436
# Test OpenJDK against latest Clojure stable
35-
- env: CLOJURE_VERSION=1.9 TARGET=test-clj
37+
- env: CLOJURE_VERSION=1.10 TARGET=test-clj
3638
jdk: openjdk8
37-
- env: CLOJURE_VERSION=1.9 TARGET=test-cljs
39+
- env: CLOJURE_VERSION=1.10 TARGET=test-cljs
3840
jdk: openjdk8
3941

4042
# Test Clojure master against a single JDK
4143
- env: CLOJURE_VERSION=master TARGET=test-clj
42-
jdk: oraclejdk8
44+
jdk: openjdk11
4345
- env: CLOJURE_VERSION=master TARGET=test-cljs
44-
jdk: oraclejdk8
46+
jdk: openjdk11
4547

4648
# Coverage analysis
47-
- env: CLOJURE_VERSION=1.9 TARGET=cloverage
49+
- env: CLOJURE_VERSION=1.10 TARGET=cloverage
4850
jdk: oraclejdk8
4951
after_success: bash <(curl -s https://codecov.io/bash) -f target/coverage/codecov.json
5052

5153
# Eastwood linter
5254
- stage: check
53-
env: CLOJURE_VERSION=1.9 TARGET=eastwood
55+
env: CLOJURE_VERSION=1.10 TARGET=eastwood
5456
jdk: oraclejdk8
5557

5658
# Check cljfmt
5759
- stage: check
58-
env: CLOJURE_VERSION=1.9 TARGET=cljfmt
60+
env: CLOJURE_VERSION=1.10 TARGET=cljfmt
5961
jdk: oraclejdk8
6062

6163
# Deployment
@@ -67,4 +69,4 @@ jobs:
6769
allow_failures:
6870
- env: CLOJURE_VERSION=master TARGET=test-clj
6971
- env: CLOJURE_VERSION=master TARGET=test-cljs
70-
- env: CLOJURE_VERSION=1.9 TARGET=cloverage
72+
- env: CLOJURE_VERSION=1.10 TARGET=cloverage

project.clj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,12 @@
9292
:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]
9393
[org.clojure/clojurescript "1.9.946" :scope "provided"]]
9494
:test-paths ["test/spec"]}
95+
:1.10 {:dependencies [[org.clojure/clojure "1.10.0"]
96+
[org.clojure/clojurescript "1.10.439" :scope "provided"]]
97+
:test-paths ["test/spec"]}
9598
:master {:repositories [["snapshots" "https://oss.sonatype.org/content/repositories/snapshots"]]
96-
:dependencies [[org.clojure/clojure "1.10.0-master-SNAPSHOT"]
97-
[org.clojure/clojurescript "1.9.946" :scope "provided"]]}
99+
:dependencies [[org.clojure/clojure "1.11.0-master-SNAPSHOT"]
100+
[org.clojure/clojurescript "1.10.439" :scope "provided"]]}
98101

99102
:test-clj {:source-paths ["test/src"]
100103
:java-source-paths ["test/java"]

test/smoketest/project.clj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
(defproject smoketest "0.1.0-SNAPSHOT"
2-
:dependencies [[nrepl "0.4.2"]
2+
:dependencies [[nrepl "0.5.3"]
33
[cider/cider-nrepl "0.19.0-SNAPSHOT"]]
44
:exclusions [org.clojure/clojure]
55
:profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
66
:1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
77
:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
8+
:1.10 {:dependencies [[org.clojure/clojure "1.10.0"]]}
89
:master {:repositories [["snapshots" "https://oss.sonatype.org/content/repositories/snapshots"]]
9-
:dependencies [[org.clojure/clojure "1.10.0-master-SNAPSHOT"]]}
10+
:dependencies [[org.clojure/clojure "1.11.0-master-SNAPSHOT"]]}
1011
:uberjar {:aot :all}}
1112
:main smoketest.core)

0 commit comments

Comments
 (0)