diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 715d1b4..fd59aef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,12 +5,13 @@ on: jobs: build: - name: Build and Test - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - name: Checkout current branch (full) - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: - fetch-depth: 0 - - name: Build project - run: sbt test + distribution: temurin + java-version: 17 + cache: sbt + - uses: sbt/setup-sbt@v1 + - run: sbt -v +test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a4bdb0..f6b3ce1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: release +name: Release on: push: branches: [master, main] @@ -12,10 +12,15 @@ env: jobs: publish: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v14 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: sbt + - uses: sbt/setup-sbt@v1 - run: sbt ci-release diff --git a/build.sbt b/build.sbt index 4378684..89c5c58 100644 --- a/build.sbt +++ b/build.sbt @@ -4,6 +4,8 @@ ThisBuild / organization := "ru.m2" ThisBuild / organizationName := "m2" ThisBuild / organizationHomepage := Some(url("https://m2.ru")) +ThisBuild / versionScheme := Some("early-semver") + ThisBuild / scmInfo := Some( ScmInfo( url("https://github.com/m2-oss/calypso"),