Skip to content

Commit 373091b

Browse files
committed
Release version 1.1.2 for scala native
1 parent cbd5e85 commit 373091b

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ dist: trusty
22
language: scala
33
jdk:
44
- oraclejdk8
5-
- openjdk11
65

76
scala:
87
- 2.11.12
9-
- 2.12.8
10-
- 2.13.0
118

129
env:
1310
global:
@@ -17,11 +14,6 @@ env:
1714
- secure: "JSv/Er6q1XtTpRH1bpU63YBf7ufwg0vW+Kv/udQBtr8YX/P3gRYC1x6hW4uwftaKMYh7wXDkfNy51SRpH3kUptdJvjPUifVElyPiYlsumetmD+rZJmxX6agx+U5pdjIXPqPoton9MdSVHNTROeTu339bDak0Z+N5ht5wRfjP7F4="
1815
# SONA_PASS
1916
- secure: "OIVtcj7AHZr8Grpf03ZmZsygcADewiYIvSnRwLYCx+5AqOzs39EZ68DsIOxi7wEXVUbVj5RvLXpKzLX3iN+UszLOQRoFPFQyyn+3Y50f8T2aRxdZtInzXn0sCVTj4Hhd/zbKl1W+2Nh3Sqazab7tFoQVzEyYqhcPeiNRMF7h+aY="
20-
matrix:
21-
# The empty SCALAJS_VERSION will only compile for the JVM
22-
- SCALAJS_VERSION=
23-
- SCALAJS_VERSION=0.6.28
24-
- SCALAJS_VERSION=1.0.0-M8
2517

2618
matrix:
2719
include:

admin/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [[ "$SCALANATIVE_VERSION" != "" ]]; then
2222
RELEASE_COMBO=true;
2323
fi
2424
elif [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then
25-
RELEASE_COMBO=true;
25+
RELEASE_COMBO=false;
2626
fi
2727

2828
if ! [ "$SCALAJS_VERSION" == "" ]; then
@@ -34,7 +34,7 @@ else
3434
fi
3535

3636
verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
37-
tagPat="^v$verPat(#$verPat#[0-9]+)?$"
37+
tagPat="^v$verPat(#native#[0-9]+)?$"
3838

3939
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
4040
tagVer=${TRAVIS_TAG}

0 commit comments

Comments
 (0)