Skip to content

Commit 93ed462

Browse files
authored
Merge pull request #866 from knocte/wip/addUnixBuilds
GithubCI: added Linux and Mac builds
2 parents 68a0cb0 + 7a86fc3 commit 93ed462

File tree

7 files changed

+68
-28
lines changed

7 files changed

+68
-28
lines changed

.github/workflows/CI.yml

Lines changed: 57 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ on:
44
push:
55
pull_request:
66

7+
env:
8+
DOTNET_VERSION: '6.0.428'
9+
710
jobs:
8-
buildAndTest:
11+
buildAndTestWindows:
912

1013
runs-on:
1114
- windows-latest
@@ -15,17 +18,67 @@ jobs:
1518
- name: Setup .NET
1619
uses: actions/setup-dotnet@v3
1720
with:
18-
dotnet-version: 6.0.428
21+
dotnet-version: ${{ env.DOTNET_VERSION }}
1922
- name: Build & Run Tests
2023
run: |
2124
.\build.cmd
2225
- name: Upload artifact (bin)
2326
uses: actions/upload-artifact@v4
2427
with:
25-
name: bin
28+
name: bin-windows
29+
path: bin
30+
- name: Upload artifact (dist)
31+
uses: actions/upload-artifact@v4
32+
with:
33+
name: dist-windows
34+
path: dist
35+
36+
buildAndTestLinux:
37+
38+
runs-on:
39+
- ubuntu-latest
40+
41+
steps:
42+
- uses: actions/checkout@v4
43+
- name: Setup .NET
44+
uses: actions/setup-dotnet@v3
45+
with:
46+
dotnet-version: ${{ env.DOTNET_VERSION }}
47+
- name: Build & Run Tests
48+
run: |
49+
./build.sh
50+
- name: Upload artifact (bin)
51+
uses: actions/upload-artifact@v4
52+
with:
53+
name: bin-linux
54+
path: bin
55+
- name: Upload artifact (dist)
56+
uses: actions/upload-artifact@v4
57+
with:
58+
name: dist-linux
59+
path: dist
60+
61+
buildAndTestMac:
62+
63+
runs-on:
64+
- macos-latest
65+
66+
steps:
67+
- uses: actions/checkout@v4
68+
- name: Setup .NET
69+
uses: actions/setup-dotnet@v3
70+
with:
71+
dotnet-version: ${{ env.DOTNET_VERSION }}
72+
- name: Build & Run Tests
73+
run: |
74+
./build.sh
75+
- name: Upload artifact (bin)
76+
uses: actions/upload-artifact@v4
77+
with:
78+
name: bin-macos
2679
path: bin
2780
- name: Upload artifact (dist)
2881
uses: actions/upload-artifact@v4
2982
with:
30-
name: dist
83+
name: dist-macos
3184
path: dist
File renamed without changes.
File renamed without changes.

.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
[![Join the chat at https://gitter.im/fsprojects/SQLProvider](https://badges.gitter.im/fsprojects/SQLProvider.svg)](https://gitter.im/fsprojects/SQLProvider?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
77

8-
A general .NET/Mono SQL database type provider. Current features :
8+
A general .NET SQL database type provider. Current features :
99
* LINQ queries
1010
* Lazy schema exploration
1111
* Automatic constraint navigation
@@ -45,9 +45,13 @@ additional samples and documentation!
4545

4646
## Building [![Build status](https://github.com/fsprojects/SQLProvider/actions/workflows/CI.yml/badge.svg?branch=master&event=push)](https://github.com/fsprojects/SQLProvider/actions?query=branch%3Amaster)
4747

48-
* Mono: Run *build.sh*
48+
* Linux/macOS: Run *build.sh*
4949
* Windows: Run *build.cmd*
5050

51+
(Note: both scripts above use the `dotnet` command underneath; if you need to build
52+
with .NETFramework v4.x or Mono, rename the '.paket_netfx' to '.paket' first, before
53+
restoring & building manually with paket and msbuild.)
54+
5155
## Known issues
5256

5357
- Database vendors other than SQL Server and Access use dynamic assembly loading. This

build.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
@echo off
2+
where /q dotnet
3+
if ERRORLEVEL 1 (
4+
echo "ERROR: 'dotnet' not found. Please ensure you have installed .NETv6 or newer" && exit /b 1
5+
)
26
rem change the target via -t, e.g.:
37
rem build -t PackNuget
48
cls

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ if test "$OS" = "Windows_NT"
33
then
44
cmd /C build.cmd
55
else
6+
which dotnet > /dev/null || { echo "ERROR: 'dotnet' not found. Please ensure you have installed .NETv6 or newer" >&2 && exit 1; }
67
dotnet tool restore
78
dotnet paket restore
89
#dotnet fsi build.fsx -t Build $@

0 commit comments

Comments
 (0)