Skip to content

Commit 1cb35de

Browse files
committed
updated build
1 parent c871374 commit 1cb35de

21 files changed

Lines changed: 7142 additions & 6530 deletions

.config/dotnet-tools.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@
99
]
1010
},
1111
"fable": {
12-
"version": "3.1.12",
12+
"version": "3.7.6",
1313
"commands": [
1414
"fable"
1515
]
16+
},
17+
"aardpack": {
18+
"version": "1.0.11",
19+
"commands": [
20+
"aardpack"
21+
]
1622
}
1723
}
1824
}

.github/workflows/fable.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Dotnet
22+
uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: '6.0.100'
25+
- name: Restore Tools
26+
run: dotnet tool restore
27+
- name: Paket Restore
28+
run: dotnet paket restore
2029
- name: Build
21-
run: sh ./build.sh -t CompileFable
30+
run: dotnet fable FSharp.Data.Adaptive.sln --outDir bin/Fable

.github/workflows/linux.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Dotnet
22+
uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: '6.0.100'
25+
- name: Restore Tools
26+
run: dotnet tool restore
27+
- name: Paket Restore
28+
run: dotnet paket restore
2029
- name: Build
21-
run: sh ./build.sh
30+
run: dotnet build
31+
- name: Test
32+
run: dotnet test -l "console;verbosity=detailed" --no-build --nologo
33+

.github/workflows/mac.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ jobs:
1616
runs-on: macos-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Dotnet
22+
uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: '6.0.100'
25+
- name: Restore Tools
26+
run: dotnet tool restore
27+
- name: Paket Restore
28+
run: dotnet paket restore
2029
- name: Build
21-
run: bash ./build.sh
30+
run: dotnet build
31+
- name: Test
32+
run: dotnet test -l "console;verbosity=detailed" --no-build --nologo

.github/workflows/windows.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ jobs:
1616
runs-on: windows-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Dotnet
22+
uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: '6.0.100'
25+
- name: Restore Tools
26+
run: dotnet tool restore
27+
- name: Paket Restore
28+
run: dotnet paket restore
2029
- name: Build
21-
run: .\build.cmd
30+
run: dotnet build
31+
- name: Test
32+
run: dotnet test -l "console;verbosity=detailed" --no-build --nologo

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ symbolCache.db
2222
*.suo
2323
/docs/output
2424
/node_modules
25-
/.fable
25+
/.fable
26+
/src/Demo/Fable/fable/
27+
**/node_modules/
28+
/bin/pack
29+
**/.DS_Store

.vscode/settings.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
"**/obj/": true,
1111
".paket/": true,
1212
".ionide/": true,
13-
".github/": true,
1413
".fake/": true,
1514
".fable/": true,
1615
"node_modules/": true,
1716
"paket-files/": true,
1817
"packages/": true,
19-
"bin/": true,
2018
"**/BenchmarkDotNet.Artifacts/": true,
2119
}
2220
}

build.cmd

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,6 @@
22
setlocal enableextensions enabledelayedexpansion
33
PUSHD %~dp0
44

5-
6-
IF NOT exist .paket\paket.exe (
7-
echo installing paket
8-
dotnet tool install Paket --tool-path .paket --version [5.249.2]
9-
)
10-
11-
if NOT exist paket.lock (
12-
echo No paket.lock found, running paket install.
13-
.paket\paket.exe install
14-
)
15-
16-
if NOT exist packages\build\fake-cli\tools\netcoreapp2.1\any\fake-cli.dll (
17-
echo running paket restore
18-
.paket\paket.exe restore
19-
)
20-
215
dotnet tool restore
22-
23-
dotnet "packages\build\fake-cli\tools\netcoreapp2.1\any\fake-cli.dll" build %*
24-
6+
dotnet paket restore
7+
dotnet build

0 commit comments

Comments
 (0)