Skip to content

Commit

Permalink
Fix TypeScript tests target + try fix Rust
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxime Mangel committed Sep 28, 2023
1 parent c9b2ea9 commit 97e70de
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
test: ["default"] # "no_std", "threaded"]
test: ["default", "no_std", "threaded"]

steps:
- uses: actions/checkout@v2
Expand All @@ -125,8 +125,11 @@ jobs:
with:
toolchain: stable

- name: Fable Library - Rust
run: ./build.sh fable-library --rust

- name: Fable Tests - Rust
run: ./build.sh test rust --${{ matrix.test }}
run: ./build.sh test rust --skip-fable-library --${{ matrix.test }}

build-dart:
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions build/FableLibrary/TypeScript.fs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ namespace Build.FableLibrary
open System.IO
open Fake.IO
open BlackFox.CommandLine
open SimpleExec

type BuildFableLibraryTypeScript() =
inherit
Expand All @@ -20,6 +21,8 @@ type BuildFableLibraryTypeScript() =
>> CmdLine.appendPrefix "--define" "FX_NO_BIGINT"

override this.CopyStage() =
Command.Run("npm", "install", workingDirectory = Build.Workspace.root)

// Copy all *.ts files to the build directory from source directory
Directory.GetFiles(this.SourceDir, "*.ts")
|> Shell.copyFiles this.OutDir
Expand Down
2 changes: 1 addition & 1 deletion build/Test/TypeScript.fs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let handle (args: string list) =
let isWatch = args |> List.contains "--watch"
let noDotnet = args |> List.contains "--no-dotnet"

BuildFableLibraryPython().Run(skipFableLibrary)
BuildFableLibraryTypeScript().Run(skipFableLibrary)

Directory.clean fableDest
Directory.clean tscDest
Expand Down

0 comments on commit 97e70de

Please sign in to comment.