Skip to content

Commit 6aee768

Browse files
committed
in with GitHub Actions, out with Travis-CI
1 parent 70d5739 commit 6aee768

File tree

7 files changed

+53
-103
lines changed

7 files changed

+53
-103
lines changed

.github/workflows/ci.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: test
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
jobs:
8+
test:
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
java: [8, 11, 17-ea]
13+
scala: [2.11.12, 2.12.14, 2.13.6, 3.0.1]
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: coursier/cache-action@v6
18+
- uses: actions/setup-java@v2
19+
with:
20+
distribution: adopt
21+
java-version: ${{matrix.java}}
22+
- name: Test
23+
run: sbt ++${{matrix.scala}} test headerCheck package

.github/workflows/release.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Release
2+
on:
3+
push:
4+
tags: ["*"]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
with:
11+
fetch-depth: 0
12+
- uses: actions/setup-java@v2
13+
with:
14+
distribution: adopt
15+
java-version: 8
16+
- run: sbt versionCheck ci-release
17+
env:
18+
PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
19+
PGP_SECRET: ${{secrets.PGP_SECRET}}
20+
SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
21+
SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}

.travis.yml

-34
This file was deleted.

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# scala-parser-combinators
22

3-
[<img src="https://img.shields.io/travis/scala/scala-parser-combinators.svg"/>](https://travis-ci.org/scala/scala-parser-combinators)
43
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12)
54
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.13.svg?label=latest%20release%20for%202.13"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.13)
65
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_3.svg?label=latest%20release%20for%203"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_3)

build.sbt

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ lazy val root = project.in(file("."))
22
.aggregate(parserCombinatorsJVM, parserCombinatorsJS, parserCombinatorsNative)
33
.settings(
44
publish / skip := true,
5+
ThisBuild / licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
6+
ThisBuild / startYear := Some(2004),
57
ThisBuild / versionScheme := Some("early-semver"),
68
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible,
79
// because it doesn't declare it itself
8-
ThisBuild / versionPolicyDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
10+
ThisBuild / libraryDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
911
)
1012

1113
lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)
@@ -15,7 +17,8 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
1517
name := "scala-parser-combinators",
1618
scalaModuleAutomaticModuleName := Some("scala.util.parsing"),
1719

18-
scalaModuleMimaPreviousVersion := Some("2.0.0"),
20+
crossScalaVersions := Seq("2.13.6", "2.12.14", "2.11.12", "3.0.1"),
21+
scalaVersion := crossScalaVersions.value.head,
1922

2023
libraryDependencies += "junit" % "junit" % "4.13.2" % Test,
2124
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
@@ -89,7 +92,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
8992
)
9093
.jsEnablePlugins(ScalaJSJUnitPlugin)
9194
.nativeSettings(
92-
scalaModuleMimaPreviousVersion := None, // https://github.com/scala/scala-parser-combinators/pull/381
95+
ThisBuild / versionPolicyIntention := Compatibility.None,
9396
compile / skip := System.getProperty("java.version").startsWith("1.6") || !scalaVersion.value.startsWith("2"),
9497
test := {},
9598
libraryDependencies := {

build.sh

-56
This file was deleted.

project/plugins.sbt

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.7.0")
3-
4-
val scalaNativeVersion =
5-
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.4.0")
6-
7-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.0")
82

93
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
10-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")
115

126
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0")
13-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
7+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")

0 commit comments

Comments
 (0)