forked from gsvgit/Brahma.FSharp
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/YaccConstructor/Brahma.FS…
- Loading branch information
Showing
3 changed files
with
43 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,16 +15,15 @@ jobs: | |
| - name: System Info | ||
| run: systeminfo | ||
|
|
||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup .NET Core | ||
| uses: actions/setup-dotnet@v1 | ||
| - uses: actions/checkout@v3 | ||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v3 | ||
| with: | ||
| global-json-file: global.json | ||
|
|
||
| - name: Build | ||
| run: ./build.cmd DotnetBuild | ||
| env: | ||
| # Work around https://github.com/actions/setup-dotnet/issues/29 | ||
| DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 | ||
| CI: true | ||
|
|
||
| win-test: | ||
|
|
@@ -38,10 +37,11 @@ jobs: | |
| - name: System Info | ||
| run: systeminfo | ||
|
|
||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup .NET Core | ||
| uses: actions/setup-dotnet@v1 | ||
| - uses: actions/checkout@v3 | ||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v3 | ||
| with: | ||
| global-json-file: global.json | ||
|
|
||
| - name: Install OpenCL | ||
| run: | | ||
|
|
@@ -52,20 +52,9 @@ jobs: | |
| # Install OpenCL Runtime | ||
| choco install opencl-intel-cpu-runtime | ||
| # - name: Download "clinfo.exe" | ||
| # uses: carlosperate/[email protected] | ||
| # with: | ||
| # file-url: https://ci.appveyor.com/api/projects/oblomov/clinfo/artifacts/clinfo.exe?job=platform:+x64 | ||
| # file-name: clinfo.exe | ||
| # | ||
| # - name: OpenCL Info | ||
| # run: clinfo.exe | ||
|
|
||
| - name: Build And Test | ||
| run: ./build.cmd | ||
| env: | ||
| # Work around https://github.com/actions/setup-dotnet/issues/29 | ||
| DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 | ||
| CI: true | ||
|
|
||
| linux-build: | ||
|
|
@@ -75,18 +64,17 @@ jobs: | |
| - name: System Info | ||
| run: lscpu | ||
|
|
||
| - uses: actions/checkout@v1 | ||
|
|
||
| - name: Setup .NET Core | ||
| uses: actions/setup-dotnet@v1 | ||
|
|
||
| - uses: actions/checkout@v3 | ||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v3 | ||
| with: | ||
| global-json-file: global.json | ||
|
|
||
| - name: Build | ||
| run: | | ||
| chmod +x ./build.sh | ||
| ./build.sh DotnetBuild | ||
| env: | ||
| # Work around https://github.com/actions/setup-dotnet/issues/29 | ||
| DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 | ||
| CI: true | ||
|
|
||
| linux-test: | ||
|
|
@@ -97,10 +85,11 @@ jobs: | |
| - name: System Info | ||
| run: lscpu | ||
|
|
||
| - uses: actions/checkout@v1 | ||
|
|
||
| - name: Setup .NET Core | ||
| uses: actions/setup-dotnet@v1 | ||
| - uses: actions/checkout@v3 | ||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v3 | ||
| with: | ||
| global-json-file: global.json | ||
|
|
||
| - name: Install OpenCL | ||
| run: | | ||
|
|
@@ -118,8 +107,6 @@ jobs: | |
| chmod +x ./build.sh | ||
| ./build.sh | ||
| env: | ||
| # Work around https://github.com/actions/setup-dotnet/issues/29 | ||
| DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 | ||
| CI: true | ||
|
|
||
| linux-test-self-hosted: | ||
|
|
@@ -130,7 +117,7 @@ jobs: | |
| - name: System Info | ||
| run: lscpu | ||
|
|
||
| - uses: actions/checkout@v1 | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: OpenCL Info | ||
| run: clinfo | ||
|
|
@@ -140,6 +127,4 @@ jobs: | |
| chmod +x ./build.sh | ||
| ./build.sh | ||
| env: | ||
| # Work around https://github.com/actions/setup-dotnet/issues/29 | ||
| DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 | ||
| CI: true | ||