Skip to content

Commit

Permalink
Move the example compilation into the ci command
Browse files Browse the repository at this point in the history
  • Loading branch information
vasilmkd committed Aug 1, 2021
1 parent 823f781 commit c9bf499
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
Expand Up @@ -114,14 +114,6 @@ jobs:
shell: bash
run: sbt ++${{ matrix.scala }} docs/mdoc

- if: matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
shell: bash
run: sbt ++${{ matrix.scala }} exampleJVM/compile

- if: matrix.ci == 'ciJS' && matrix.os == 'ubuntu-latest'
shell: bash
run: sbt ++${{ matrix.scala }} exampleJS/compile

- name: Test Example JVM App Within Sbt
if: matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
shell: bash
Expand Down
12 changes: 4 additions & 8 deletions build.sbt
Expand Up @@ -82,12 +82,6 @@ ThisBuild / githubWorkflowBuild := Seq(
List("docs/mdoc"),
cond = Some(
s"(matrix.scala == '$Scala213' || matrix.scala == '$Scala3') && matrix.ci == 'ciJVM'")),
WorkflowStep.Sbt(
List("exampleJVM/compile"),
cond = Some(s"matrix.ci == 'ciJVM' && matrix.os == '$PrimaryOS'")),
WorkflowStep.Sbt(
List("exampleJS/compile"),
cond = Some(s"matrix.ci == 'ciJS' && matrix.os == '$PrimaryOS'")),
WorkflowStep.Run(
List("example/test-jvm.sh ${{ matrix.scala }}"),
name = Some("Test Example JVM App Within Sbt"),
Expand Down Expand Up @@ -191,8 +185,10 @@ replaceCommandAlias(

addCommandAlias(
"ciJVM",
"; project rootJVM; headerCheck; scalafmtCheck; clean; test; mimaReportBinaryIssues; root/unidoc213")
addCommandAlias("ciJS", "; project rootJS; headerCheck; scalafmtCheck; clean; test")
"; project rootJVM; headerCheck; scalafmtCheck; clean; test; mimaReportBinaryIssues; root/unidoc213; exampleJVM/compile")
addCommandAlias(
"ciJS",
"; project rootJS; headerCheck; scalafmtCheck; clean; test; exampleJS/compile")

// we do the browser ci *only* on core because we're only really interested in IO here
def browserCiCommand(browser: JSEnv) =
Expand Down

0 comments on commit c9bf499

Please sign in to comment.