Skip to content

Commit

Permalink
Merge pull request #104 from ahjohannessen/wip-remove-scala213
Browse files Browse the repository at this point in the history
build: only Scala 3
  • Loading branch information
ahjohannessen authored Apr 3, 2024
2 parents 2a41852 + 7dddb7d commit 6d59092
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3, 2.13]
scala: [3]
java: [temurin@17]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down Expand Up @@ -122,16 +122,6 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13

- name: Inflate target directories (2.13)
run: |
tar xf targets.tar
rm targets.tar
- name: Import signing key
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
env:
Expand Down Expand Up @@ -186,7 +176,7 @@ jobs:
- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: root_3 root_2.13
modules-ignore: root_3
configs-ignore: test scala-tool scala-doc-tool test-internal

validate-steward:
Expand Down
1 change: 0 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ pull_request_rules:
- body~=labels:.*early-semver-patch
- body~=labels:.*early-semver-minor
- status-success=Build and Test (ubuntu-latest, 3, temurin@17)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
actions:
merge: {}
- name: Label unum PRs
Expand Down
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import deps._
Global / onChangedBuildSource := ReloadOnSourceChanges
Global / lintUnusedKeysOnLoad := false

lazy val Scala2 = "2.13.13"
lazy val Scala3 = "3.4.1"

lazy val root = project
Expand All @@ -23,7 +22,7 @@ lazy val unum = project
inThisBuild(
List(
scalaVersion := Scala3,
crossScalaVersions := Seq(Scala3, Scala2),
crossScalaVersions := Seq(Scala3),
tlJdkRelease := Some(8),
tlBaseVersion := "1.2",
tlSonatypeUseLegacyHost := false,
Expand Down

0 comments on commit 6d59092

Please sign in to comment.