Skip to content

Setup Safari ci #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 27 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
74c214f
Setup Safari ci
armanbilge Sep 7, 2021
31bab00
Don't run Safari on ubuntu
armanbilge Sep 7, 2021
779f485
Cache Safari JSEnv
armanbilge Sep 7, 2021
35e7b42
Revert "Cache Safari JSEnv"
armanbilge Sep 12, 2021
e0ed1b7
Enable Test / parallelExecution := false
armanbilge Sep 12, 2021
741b369
Merge branch 'main' into feature/safari
armanbilge Sep 12, 2021
94258c3
Merge branch 'main' into feature/safari
armanbilge Sep 12, 2021
534e8ec
Try adding a killall
armanbilge Sep 12, 2021
196f429
Use correct syntax
armanbilge Sep 12, 2021
0462360
Cache Safari JSEnv
armanbilge Sep 7, 2021
d4f7279
Test only core on Safari for now
armanbilge Sep 12, 2021
419e29e
Enable keepAlive
armanbilge Sep 12, 2021
18aa42b
Merge remote-tracking branch 'upstream/main' into feature/safari
armanbilge Apr 28, 2022
1cc8fce
Don't do weird stuff
armanbilge Apr 28, 2022
0db7bf6
Simplify build config
armanbilge Apr 28, 2022
1eb424a
Revert "Simplify build config"
armanbilge Apr 28, 2022
367775d
Remove keepalive for Safari
armanbilge Apr 28, 2022
65913cc
Temporarily disable webworkers project
armanbilge Apr 28, 2022
035370f
Revert "Temporarily disable webworkers project"
armanbilge Apr 28, 2022
9d96432
Try try again
armanbilge Apr 28, 2022
6ea98e3
Poke ci
armanbilge Apr 28, 2022
a899b2f
Disable parallel exec
armanbilge Apr 28, 2022
03919b3
One more grand idea
armanbilge Apr 28, 2022
29738da
no idea
armanbilge Apr 28, 2022
2a17a9e
Try to limit threads
armanbilge Apr 28, 2022
d370996
Prefix JVM opts with -J
armanbilge Apr 28, 2022
918654f
Regenerate workflow
armanbilge Apr 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Simplify build config"
This reverts commit 0db7bf6.
  • Loading branch information
armanbilge committed Apr 28, 2022
commit 1eb424a6fa951e767c4c57e5aecd3d6c355c2774
14 changes: 11 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,20 @@ jobs:
name: Build and Test
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-latest, macos-latest]
scala: [2.11.12, 2.12.15, 2.13.7, 3.0.2]
java: [temurin@11]
ci: [ciNode, ciFirefox, ciChrome, ciJSDOMNodeJS]
include:
ci: [ciNode, ciFirefox, ciChrome, ciSafari, ciJSDOMNodeJS]
exclude:
- ci: ciSafari
os: ubuntu-latest
- ci: ciNode
os: macos-latest
- ci: ciFirefox
os: macos-latest
- ci: ciChrome
os: macos-latest
- ci: ciJSDOMNodeJS
os: macos-latest
runs-on: ${{ matrix.os }}
steps:
Expand Down
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.15", "2.13.7", "3.0.2")

val PrimaryOS = "ubuntu-latest"
val MacOS = "macos-latest"
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS)
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)

ThisBuild / githubWorkflowBuildPreamble ++= Seq(
WorkflowStep.Use(
Expand All @@ -63,9 +63,11 @@ ThisBuild / githubWorkflowBuildPreamble ++= Seq(
name = Some("Install jsdom"),
cond = Some("matrix.ci == 'ciJSDOMNodeJS'")))

val ciVariants = List("ciNode", "ciFirefox", "ciChrome", "ciJSDOMNodeJS")
val ciVariants = List("ciNode", "ciFirefox", "ciChrome", "ciSafari", "ciJSDOMNodeJS")

ThisBuild / githubWorkflowBuildMatrixInclusions += MatrixInclude(Map.empty, Map("ci" -> "ciSafari", "os" -> MacOS))
ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("ci" -> "ciSafari", "os" -> PrimaryOS))
ThisBuild / githubWorkflowBuildMatrixExclusions ++= ciVariants.filter(_ != "ciSafari")
.map(ci => MatrixExclude(Map("ci" -> ci, "os" -> MacOS)))

ThisBuild / githubWorkflowBuildMatrixAdditions += "ci" -> ciVariants

Expand Down