Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:b3b00/csly into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
b3b00 committed Jun 12, 2020
2 parents 780a43a + f290fd1 commit 3112216
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 55 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ on:
jobs:
build:

runs-on: windows-2019

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
Expand All @@ -26,10 +28,12 @@ jobs:
run: dotnet test -c Debug #uses msbuild.rsp for coverlet configuration
- name: coveralls
uses: coverallsapp/[email protected]
if: matrix.os == 'windows-latest'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./ParserTests/lcov.info
- name: push
if: matrix.os == 'windows-latest'
id: publish_nuget
uses: brandedoutcast/[email protected]
with:
Expand All @@ -38,7 +42,7 @@ jobs:
NUGET_KEY: ${{ secrets.NUGET_KEY }}
VERSION_FILE_PATH: sly/sly.csproj
- name: Create Release
if: ${{ success() && steps.publish_nuget.outputs.VERSION != '' && steps.publish_nuget.outputs.VERSION != null }}
if: ${{ success() && matrix.os == 'windows-latest' && steps.publish_nuget.outputs.VERSION != '' && steps.publish_nuget.outputs.VERSION != null }}
id: create_release
uses: actions/create-release@latest
env:
Expand All @@ -49,7 +53,7 @@ jobs:
draft: false
prerelease: false
- name: Upload Release Asset
if: ${{ success() && steps.create_release.outputs.upload_url != '' && steps.create_release.outputs.upload_url != null }}
if: ${{ success() && matrix.os == 'windows-latest' && steps.create_release.outputs.upload_url != '' && steps.create_release.outputs.upload_url != null }}
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
Expand Down
50 changes: 0 additions & 50 deletions samples/ParserExample/Issue183Lexer.cs

This file was deleted.

2 changes: 1 addition & 1 deletion samples/ParserExample/ParserExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Authors>b3b00</Authors>
</PropertyGroup>

Expand Down

0 comments on commit 3112216

Please sign in to comment.