From bdd497b8a888ebfe67e04635b8d7a1dc942e4f4a Mon Sep 17 00:00:00 2001 From: Olivier Duhart <1224790+b3b00@users.noreply.github.com> Date: Mon, 8 Jun 2020 10:10:19 +0200 Subject: [PATCH 1/7] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 8edab4d1..861d56a8 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -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 From 362469e1ee807988ac4a563ec2cd461871381b11 Mon Sep 17 00:00:00 2001 From: Olivier Duhart <1224790+b3b00@users.noreply.github.com> Date: Mon, 8 Jun 2020 10:11:45 +0200 Subject: [PATCH 2/7] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 861d56a8..89496b87 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -13,7 +13,7 @@ jobs: build: runs-on: ${{ matrix.os }} - strategy: + strategy: matrix: os: [ubuntu-latest, windows-latest] steps: From 1ea3e0e7cca3132072bd4982de8049d0b09fc657 Mon Sep 17 00:00:00 2001 From: b3b00 Date: Mon, 8 Jun 2020 11:01:54 +0200 Subject: [PATCH 3/7] houps --- samples/ParserExample/Issue183Lexer.cs | 50 -------------------------- 1 file changed, 50 deletions(-) delete mode 100644 samples/ParserExample/Issue183Lexer.cs diff --git a/samples/ParserExample/Issue183Lexer.cs b/samples/ParserExample/Issue183Lexer.cs deleted file mode 100644 index 797f735d..00000000 --- a/samples/ParserExample/Issue183Lexer.cs +++ /dev/null @@ -1,50 +0,0 @@ -using sly.lexer; - -namespace ParserExample -{ - public enum Issue165Lexer - { - [Lexeme(GenericToken.SugarToken,"?")] - QUESTIONMARK = 1, - - [Lexeme(GenericToken.SugarToken,"+")] - PLUS = 2, - - [Lexeme(GenericToken.SugarToken,"-")] - MINUS = 3, - - [Lexeme(GenericToken.SugarToken,"*")] - TIMES = 4, - - [Lexeme(GenericToken.SugarToken,"/")] - DIVIDE = 5, - - [Lexeme(GenericToken.SugarToken,"(")] - LPAR = 6, - - [Lexeme(GenericToken.SugarToken,")")] - RPAR = 6, - - [Lexeme(GenericToken.SugarToken,"[")] - LBR = 7, - - [Lexeme(GenericToken.SugarToken,"]")] - RBR = 8, - - [Lexeme(GenericToken.SugarToken,":")] - COLON = 7, - - [Lexeme(GenericToken.SugarToken,"=")] - EQ = 8, - - - [Lexeme(GenericToken.Identifier)] ID = 20, - - [Lexeme(GenericToken.String)] STRING = 21, - - [Lexeme(GenericToken.Int)] INT = 22, - - - - } -} \ No newline at end of file From 55b68dce55d660f1ea53dfcc9bcaf4192f873768 Mon Sep 17 00:00:00 2001 From: b3b00 Date: Mon, 8 Jun 2020 11:06:47 +0200 Subject: [PATCH 4/7] upgrade framework --- ParserTests/ParserTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParserTests/ParserTests.csproj b/ParserTests/ParserTests.csproj index d3982ca3..e4adc90f 100644 --- a/ParserTests/ParserTests.csproj +++ b/ParserTests/ParserTests.csproj @@ -1,6 +1,6 @@  - netcoreapp2.0 + netcoreapp3.1 b3b00 From 2597bcf63300728d4ecb4d484016842ca379b1f9 Mon Sep 17 00:00:00 2001 From: b3b00 Date: Mon, 8 Jun 2020 11:08:51 +0200 Subject: [PATCH 5/7] upgrade framework --- samples/ParserExample/ParserExample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ParserExample/ParserExample.csproj b/samples/ParserExample/ParserExample.csproj index 9f8dc89d..ebcbd018 100644 --- a/samples/ParserExample/ParserExample.csproj +++ b/samples/ParserExample/ParserExample.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp3.1 b3b00 From 6cde40274066bbb8fa787e10ef882698f860fd31 Mon Sep 17 00:00:00 2001 From: b3b00 Date: Mon, 8 Jun 2020 11:14:30 +0200 Subject: [PATCH 6/7] trying os matrix --- .github/workflows/dotnetcore.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 89496b87..55a6bce3 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -28,6 +28,7 @@ jobs: run: dotnet test -c Debug #uses msbuild.rsp for coverlet configuration - name: coveralls uses: coverallsapp/github-action@v1.1.1 + if: matrix.os == 'windows-latest' with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./ParserTests/lcov.info @@ -40,7 +41,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: @@ -51,7 +52,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: From f290fd1aec0b365876fa4661cedaffd9548ee70c Mon Sep 17 00:00:00 2001 From: b3b00 Date: Mon, 8 Jun 2020 11:51:24 +0200 Subject: [PATCH 7/7] missed --- .github/workflows/dotnetcore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 55a6bce3..1e5a1c7a 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -33,6 +33,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./ParserTests/lcov.info - name: push + if: matrix.os == 'windows-latest' id: publish_nuget uses: brandedoutcast/publish-nuget@v2.5.2 with: