Skip to content

Commit

Permalink
Merge pull request #181 from nojaf/replace-fake
Browse files Browse the repository at this point in the history
Replace FAKE with Fun.Build
  • Loading branch information
cartermp authored Apr 24, 2024
2 parents e0c475f + ad82907 commit 6316952
Show file tree
Hide file tree
Showing 12 changed files with 244 additions and 1,406 deletions.
4 changes: 0 additions & 4 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "6.0.0",
"commands": ["fake"]
},
"paket": {
"version": "7.2.1",
"commands": ["paket"]
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
dotnet: [7.0.404]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ matrix.dotnet }}
uses: actions/setup-dotnet@v4
- name: Restore .NET local tools
run: dotnet tool restore
- name: Restore packages
run: dotnet paket restore
- name: Build and test
run: dotnet fake build target CIBuild
run: dotnet fsi build.fsx -- -p CIBuild
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,6 @@ src/XPlot.Plotly/Tests/ConvertJS.fsx
.paket/
paket-files/

# FAKE
.fake
.ionide
# Editors
.ionide
.idea
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ http://fslaborg.github.io/XPlot/

## Release

.\build target NuGet
set APIKEY=...
..\FsLab\.nuget\NuGet.exe push bin\*.nupkg %APIKEY% -Source https://www.nuget.org
dotnet fsi build.fsx -- -p Release

## Contact

Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ cls

dotnet tool restore
dotnet paket restore
dotnet fake build %*
dotnet fsi build.fsx -- %*
Loading

0 comments on commit 6316952

Please sign in to comment.