Skip to content

Commit

Permalink
ci - runs on ubuntu-22.04 (#894)
Browse files Browse the repository at this point in the history
  • Loading branch information
justcoon authored Oct 10, 2024
1 parent 6143a2c commit 01f9e51
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 16 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
jobs:
build:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: true
steps:
- name: Git Checkout
Expand All @@ -43,7 +43,7 @@ jobs:
run: sbt docs/clean; sbt docs/buildWebsite
lint:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
steps:
- name: Git Checkout
Expand All @@ -66,7 +66,7 @@ jobs:
run: sbt lint
test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
strategy:
fail-fast: false
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
run: sbt +test
compile-examples:
name: Compile examples
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
strategy:
fail-fast: true
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
run: sbt ++${{ matrix.scala }} examplesCore/compile examplesJpl/compile examplesJulBridge/compile examplesSlf4j2Bridge/compile examplesSlf4jLogback/compile examplesSlf4j2Logback/compile examplesSlf4j2Log4j/compile benchmarks/compile
update-readme:
name: Update README
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
if: ${{ github.event_name == 'push' }}
steps:
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
run: echo "ci passed"
release:
name: Release
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
needs:
- ci
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
release-docs:
name: Release Docs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
needs:
- release
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
notify-docs-release:
name: Notify Docs Release
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
continue-on-error: false
needs:
- release-docs
Expand Down
24 changes: 16 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,26 @@ import Versions.*
import MimaSettings.mimaSettings
import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject }
import zio.sbt.ZioSbtCiPlugin.{ CacheDependencies, Checkout, SetupJava, SetupLibuv }
import zio.sbt.githubactions.OS.UbuntuLatest
import zio.sbt.githubactions.{ Job, Strategy }
import zio.sbt.githubactions.Step.SingleStep

enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)

lazy val ciRunsOn = "ubuntu-22.04"

def ciJobWithSetup(job: Job) = job.copy(runsOn = ciRunsOn)

inThisBuild(
List(
name := "zio-logging",
ciEnabledBranches := Seq("master"),
ciTestJobs := ciTestJobs.value :+ compileExamplesJob.value,
developers := List(
name := "zio-logging",
ciEnabledBranches := Seq("master"),
ciTestJobs := ciTestJobs.value.map(ciJobWithSetup) :+ compileExamplesJob.value,
ciLintJobs := ciLintJobs.value.map(ciJobWithSetup),
ciBuildJobs := ciBuildJobs.value.map(ciJobWithSetup),
ciReleaseJobs := ciReleaseJobs.value.map(ciJobWithSetup),
ciUpdateReadmeJobs := ciUpdateReadmeJobs.value.map(ciJobWithSetup),
ciPostReleaseJobs := ciPostReleaseJobs.value.map(ciJobWithSetup),
developers := List(
Developer("jdegoes", "John De Goes", "[email protected]", url("http://degoes.net")),
Developer(
"pshemass",
Expand All @@ -24,8 +32,8 @@ inThisBuild(
),
Developer("justcoon", "Peter Kotula", "[email protected]", url("https://github.com/justcoon"))
),
zioVersion := "2.1.9",
scala213 := "2.13.14"
zioVersion := "2.1.9",
scala213 := "2.13.14"
)
)

Expand Down Expand Up @@ -285,6 +293,6 @@ lazy val compileExamplesJob = Def.setting {
)
)
),
runsOn = UbuntuLatest.asString
runsOn = ciRunsOn
)
}

0 comments on commit 01f9e51

Please sign in to comment.