From 9c2936071fe92e67040616fd3908b099d3ffecc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Thu, 1 Feb 2024 09:36:27 -0800 Subject: [PATCH 1/6] Update AstBuilder.cs --- Irony/Ast/AstBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irony/Ast/AstBuilder.cs b/Irony/Ast/AstBuilder.cs index fbe1caa..1b943e6 100644 --- a/Irony/Ast/AstBuilder.cs +++ b/Irony/Ast/AstBuilder.cs @@ -9,7 +9,7 @@ * You must not remove this notice from this software. * **********************************************************************************/ #endregion - +ERROR using System; using System.Collections.Generic; using System.Linq; From 2ffbebbb2e70d395ef4a3a4e6f8b39cf7b8bca03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Thu, 1 Feb 2024 09:38:45 -0800 Subject: [PATCH 2/6] Fix tests location --- .github/workflows/build.yml | 2 +- Irony/Ast/AstBuilder.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19960c0..9afb977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,4 +20,4 @@ jobs: uses: actions/checkout@v3 - name: Test - run: dotnet test ./040.Irony.Tests.VsTest.csproj -c release + run: dotnet test ./Irony.Tests/040.Irony.Tests.VsTest.csproj -c release diff --git a/Irony/Ast/AstBuilder.cs b/Irony/Ast/AstBuilder.cs index 1b943e6..fbe1caa 100644 --- a/Irony/Ast/AstBuilder.cs +++ b/Irony/Ast/AstBuilder.cs @@ -9,7 +9,7 @@ * You must not remove this notice from this software. * **********************************************************************************/ #endregion -ERROR + using System; using System.Collections.Generic; using System.Linq; From 039a56a70b10089cfab1258f45b893789017fdc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Thu, 1 Feb 2024 09:46:17 -0800 Subject: [PATCH 3/6] Run tests on windows and linux --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9afb977..1bcfd13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,23 +1,23 @@ name: Build on: - push: - branches: [ master ] - pull_request: branches: [ master ] jobs: build: + strategy: + matrix: + os: [ubuntu-latest, windows-latest] - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} env: DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: 1 steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: dotnet test ./Irony.Tests/040.Irony.Tests.VsTest.csproj -c release From 372204d00dcec240ad82ac4c28ee72847823f1f4 Mon Sep 17 00:00:00 2001 From: yallie Date: Sat, 3 Feb 2024 13:33:28 +0300 Subject: [PATCH 4/6] Deleted appveyor.yml, now superseded by Github Actions. --- appveyor.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 16a81ab..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: 1.0.{build} - -image: Visual Studio 2022 - -configuration : Release - -before_build: -- cmd: nuget restore Irony.sln - -build: - project: Irony.sln - parallel: true - verbosity: minimal - -artifacts: -- path: Irony/bin/Release/netstandard2.0/Irony.dll -- path: Irony/bin/Release/netstandard2.0/Irony.pdb -- path: packages/*.nupkg From c73c7d85aac6d9343c7d36010bb8ed362e3d0c16 Mon Sep 17 00:00:00 2001 From: yallie Date: Sat, 3 Feb 2024 13:40:45 +0300 Subject: [PATCH 5/6] Removed the Appveyor badge. --- ReadMe.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 2fbb515..db1aa03 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,9 +1,8 @@ # Irony — .NET Language Implementation Kit https://github.com/IronyProject/Irony -[![appveyor](https://ci.appveyor.com/api/projects/status/github/ironyproject/irony?svg=true)](https://ci.appveyor.com/project/yallie/irony) -[![tests](https://img.shields.io/appveyor/tests/yallie/irony.svg)](https://ci.appveyor.com/project/yallie/irony/build/tests) -[![nuget](https://img.shields.io/nuget/v/Irony.svg)](https://www.nuget.org/packages/Irony) +[![Github Actions](https://github.com/IronyProject/Irony/actions/workflows/build.yml/badge.svg)](https://github.com/IronyProject/Irony/actions) +[![Nuget](https://img.shields.io/nuget/v/Irony.svg)](https://www.nuget.org/packages/Irony) ### Prerequisites From dfdb0ccbce36b39ff53af759c91575eb9772dd71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Tue, 20 Feb 2024 17:26:53 -0800 Subject: [PATCH 6/6] Fix tests on linux --- Irony.Tests/EvaluatorTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irony.Tests/EvaluatorTests.cs b/Irony.Tests/EvaluatorTests.cs index e2ab49e..b3dd542 100644 --- a/Irony.Tests/EvaluatorTests.cs +++ b/Irony.Tests/EvaluatorTests.cs @@ -124,7 +124,7 @@ public void TestEvaluator_BuiltIns() { script = @"print(format('{0} * {1} = {2}', 3, 4, 3 * 4))"; eval.Evaluate(script); result = eval.GetOutput(); - Assert.AreEqual("3 * 4 = 12\r\n", result, "Unexpected computation result"); + Assert.AreEqual("3 * 4 = 12" + Environment.NewLine, result, "Unexpected computation result"); //Add custom built-in method SayHello and test it eval.Runtime.BuiltIns.AddMethod(SayHello, "SayHello", 1, 1, "name");