From d05e311842ab5e81af9cf05eaa3bf610e78a70cf Mon Sep 17 00:00:00 2001 From: kolotaev Date: Sun, 28 May 2023 12:36:45 +0400 Subject: [PATCH 1/3] Add github actions --- .github/workflows/ci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..196863c --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,23 @@ +name: CI + +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Run tests for all versions + run: sbt +test + + - name: Run test coverage + run: sbt clean coverage test + + - name: Coverage Report + run: sbt coverageReport + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v2 + with: + fail_ci_if_error: true From 1f8e645338b9a63bddd971ab301725083eebcbc4 Mon Sep 17 00:00:00 2001 From: kolotaev Date: Sun, 28 May 2023 12:37:18 +0400 Subject: [PATCH 2/3] Remove Travis CI from project --- .travis.yml | 16 ---------------- README.md | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 166e1a1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: scala - -dist: trusty - -scala: - - 2.12.2 - - 2.13.1 - -jdk: - - oraclejdk8 - -script: - - sbt clean coverage test coverageReport - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/README.md b/README.md index 468d883..4c24964 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ride -[![Build Status](https://travis-ci.org/kolotaev/ride.svg?branch=master)](https://travis-ci.org/kolotaev/ride) +[![Build Status](https://github.com/kolotaev/ride/workflows/CI/badge.svg?branch=master)](https://github.com/kolotaev/ride/actions) [![codecov.io](https://codecov.io/github/kolotaev/ride/coverage.svg?branch=master)](https://codecov.io/github/kolotaev/ride?branch=master) [![Maven Central](https://img.shields.io/maven-central/v/com.github.kolotaev/ride_2.12.svg?label=Maven%20Central%20|%20Scala%202.12)](https://search.maven.org/search?q=g:%22com.github.kolotaev%22%20AND%20a:%22ride_2.12%22) [![Maven Central](https://img.shields.io/maven-central/v/com.github.kolotaev/ride_2.13.svg?label=Maven%20Central%20|%20Scala%202.13)](https://search.maven.org/search?q=g:%22com.github.kolotaev%22%20AND%20a:%22ride_2.13%22) From 06911915a66f914f8c654209b69fe26debaba736 Mon Sep 17 00:00:00 2001 From: kolotaev Date: Sun, 28 May 2023 12:56:24 +0400 Subject: [PATCH 3/3] Upgrade scala and sbt-coverage versions --- build.sbt | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 70385c0..7a8a357 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ val username = "kolotaev" val repo = "ride" -val SCALA_2_12 = "2.12.2" -val SCALA_2_13 = "2.13.1" +val SCALA_2_12 = "2.12.15" +val SCALA_2_13 = "2.13.10" name := "ride" organization := s"com.github.$username" diff --git a/project/build.properties b/project/build.properties index 64317fd..22af262 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=1.7.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 33c6e93..32d463e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3") // For releasing (Sonatype Nexus and Maven Central) addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")