diff --git a/.github/workflows/build-nightly.yaml b/.github/workflows/build-nightly.yaml index ed7bbcd..8dde572 100644 --- a/.github/workflows/build-nightly.yaml +++ b/.github/workflows/build-nightly.yaml @@ -17,12 +17,9 @@ jobs: java-version: 21 distribution: zulu - run: | - # download today's or yesterday's Flix JAR - today=$(date -d today +%Y-%m-%d) - yesterday=$(date -d yesterday +%Y-%m-%d) - today_url="https://flix.dev/nightly/flix-${today}.jar" - yesterday_url="https://flix.dev/nightly/flix-${yesterday}.jar" - curl -L -f "${today_url}" > flix.jar || curl -L -f "${yesterday_url}" > flix.jar + # download the latest nightly Flix JAR + url="https://github.com/mlutze/flix-nightly/releases/latest/download/flix.jar" + curl -L -f "$url" > flix.jar # run tests java -jar flix.jar test --github-token ${{ github.token }} diff --git a/flix.toml b/flix.toml index 06e94dd..07af53f 100644 --- a/flix.toml +++ b/flix.toml @@ -7,4 +7,4 @@ authors = ["Matthew Lutze", "Jonathan Starup"] [dependencies] "github:JonathanStarup/Flix-ANSI-Terminal" = "1.8.0" -"github:mlutze/flix-json" = "0.12.18" +"github:mlutze/flix-json" = "0.12.19" diff --git a/src/Main.flix b/src/Main.flix index 6d87ee0..ec79520 100644 --- a/src/Main.flix +++ b/src/Main.flix @@ -1,5 +1,5 @@ -pub def main(): Unit \ {IO, Sys, NonDet} = Flixball.Main.main() +pub def main(): Unit \ IO = Flixball.Main.main() mod Flixball.Main { import java.lang.Thread @@ -16,7 +16,7 @@ mod Flixball.Main { use Flixball.Options.usage use Flixball.Version.version - pub def main(): Unit \ {IO, Sys, NonDet} = { + pub def main(): Unit \ IO = { run { let args = Environment.getArgs(); match parse(args) { @@ -49,7 +49,7 @@ mod Flixball.Main { } } - def mkRunConfig(runOpts: List[RunOption], dispOpts: List[DisplayOption]): Result[String, RunConfig] \ IO + FileReadWithResult + NonDet = { + def mkRunConfig(runOpts: List[RunOption], dispOpts: List[DisplayOption]): Result[String, RunConfig] \ IO + FileReadWithResult = { use Result.flatMap; let seed = runOpts |> List.findMap(x -> match x {