Skip to content

Commit d025f9c

Browse files
committed
Merge branch 'github-actions'
2 parents 85c2003 + b93e31a commit d025f9c

File tree

8 files changed

+92
-55
lines changed

8 files changed

+92
-55
lines changed

.appveyor.yml

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

.github/workflows/ci.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Build and Test
2+
on:
3+
push:
4+
workflow_dispatch:
5+
6+
jobs:
7+
build_and_test:
8+
runs-on: windows-2019
9+
env:
10+
DOTNET_NOLOGO: true
11+
DOTNET_CLI_TELEMETRY_OPTOUT: true
12+
strategy:
13+
matrix:
14+
dotnet-version: [ '5.0.x' ]
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up .NET Core ${{ matrix.dotnet-version }}
18+
uses: actions/setup-dotnet@v1.7.2
19+
with:
20+
dotnet-version: ${{ matrix.dotnet-version }}
21+
- name: Install Dependencies
22+
run: dotnet restore
23+
- name: Get SNK
24+
run: move Source/IronMeta.Library/IronMeta.PRS.snk Source/IronMeta.Library/IronMeta.snk
25+
- name: Build
26+
run: dotnet build -c Release --no-restore IronMeta.sln
27+
- name: Test
28+
run: dotnet test -c Release --no-build --no-restore --verbosity normal

.github/workflows/release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Release
2+
on:
3+
release:
4+
types: [created]
5+
6+
jobs:
7+
build_and_test:
8+
runs-on: windows-2019
9+
env:
10+
DOTNET_NOLOGO: true
11+
DOTNET_CLI_TELEMETRY_OPTOUT: true
12+
strategy:
13+
matrix:
14+
dotnet-version: [ '5.0.x' ]
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up .NET Core ${{ matrix.dotnet-version }}
18+
uses: actions/setup-dotnet@v1.7.2
19+
with:
20+
dotnet-version: ${{ matrix.dotnet-version }}
21+
- name: Install Dependencies
22+
run: dotnet restore
23+
- name: Get SNK
24+
run: cd Source/IronMeta.Library && 7z e -p${{ secrets.SNK_DECRYPTION_KEY }} IronMeta.snk.zip
25+
- name: Build
26+
run: dotnet build -c Release --no-restore IronMeta.sln
27+
- name: Test
28+
run: dotnet test -c Release --no-build --no-restore --verbosity normal
29+
- name: Package
30+
run: dotnet pack -c Release --no-build --no-restore Source/IronMeta.Library/IronMeta.Library.csproj
31+
- name: Push to NuGet
32+
run: gci Source/IronMeta.Library/bin/Release/*.nupkg | %{ dotnet nuget push $_ --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json }

IronMeta.sln

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronMeta.VSExtension", "Too
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{977A88E9-26EF-4882-BFEC-CFCA89F8F8E8}"
1717
ProjectSection(SolutionItems) = preProject
18-
.appveyor.yml = .appveyor.yml
1918
.gitignore = .gitignore
2019
CHANGELOG.md = CHANGELOG.md
2120
License.txt = License.txt
2221
README.md = README.md
2322
EndProjectSection
2423
EndProject
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{C06CFD1E-00C7-4181-A332-2306CB5559A7}"
25+
ProjectSection(SolutionItems) = preProject
26+
.github\workflows\ci.yml = .github\workflows\ci.yml
27+
.github\workflows\release.yml = .github\workflows\release.yml
28+
EndProjectSection
2529
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronMeta.Benchmarks", "Source\IronMeta.Benchmarks\IronMeta.Benchmarks.csproj", "{33D8CE3F-B6B9-4545-B16D-2D7AE83199BF}"
2630
EndProject
2731
Global
@@ -56,6 +60,9 @@ Global
5660
GlobalSection(SolutionProperties) = preSolution
5761
HideSolutionNode = FALSE
5862
EndGlobalSection
63+
GlobalSection(NestedProjects) = preSolution
64+
{C06CFD1E-00C7-4181-A332-2306CB5559A7} = {977A88E9-26EF-4882-BFEC-CFCA89F8F8E8}
65+
EndGlobalSection
5966
GlobalSection(ExtensibilityGlobals) = postSolution
6067
SolutionGuid = {D4094F1F-EB10-4B13-9466-140AF24AD50F}
6168
EndGlobalSection

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| | |
22
| ----- | ----- |
3-
| Build | [![AppVeyor](https://img.shields.io/appveyor/ci/kulibali/ironmeta.svg)](https://ci.appveyor.com/project/kulibali/ironmeta) |
3+
| Build | [![CI](https://github.com/kulibali/ironmeta/actions/workflows/ci.yml/badge.svg)](https://github.com/kulibali/ironmeta/actions/workflows/ci.yml) |
44
| NuGet | [![NuGet](https://img.shields.io/nuget/dt/IronMeta.svg)](https://www.nuget.org/packages/IronMeta) |
55

66

Source/IronMeta.Library/IronMeta.Library.csproj

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>IronMeta.snk</AssemblyOriginatorKeyFile>
99
<DelaySign>false</DelaySign>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
1013
<PackageId>IronMeta</PackageId>
1114
<Version>4.4.6</Version>
1215
<Authors>Gordon Tisher</Authors>
1316
<Company>Gordon Tisher</Company>
1417
<Product>IronMeta</Product>
1518
<Description>The IronMeta parser generator provides a programming language and application for generating pattern matchers on arbitrary streams of objects. It is an implementation of Alessandro Warth's OMeta system for C#.</Description>
1619
<Copyright>IronMeta Copyright © Gordon Tisher</Copyright>
17-
<PackageLicenseUrl>https://github.com/kulibali/ironmeta/blob/master/License.txt</PackageLicenseUrl>
20+
<PackageLicenseFile>License.txt</PackageLicenseFile>
1821
<PackageProjectUrl>https://github.com/kulibali/ironmeta</PackageProjectUrl>
1922
<RepositoryUrl>https://github.com/kulibali/ironmeta</RepositoryUrl>
2023
<PackageTags>PEG parser parsergenerator</PackageTags>
@@ -23,31 +26,35 @@
2326
<FileVersion>4.4.6.0</FileVersion>
2427
</PropertyGroup>
2528

29+
<ItemGroup>
30+
<None Include="../../License.txt" Pack="true" PackagePath="" />
31+
</ItemGroup>
32+
2633
<ItemGroup Condition="'$(Configuration)' == 'Release'">
27-
<Content Include="..\IronMeta.App\bin\Release\net48\IronMeta.App.exe">
28-
<PackagePath>tools\net48</PackagePath>
34+
<Content Include="../IronMeta.App/bin/Release/net48/IronMeta.App.exe">
35+
<PackagePath>tools/net48</PackagePath>
2936
</Content>
30-
<Content Include="..\IronMeta.App\bin\Release\net48\IronMeta.Library.dll">
31-
<PackagePath>tools\net48</PackagePath>
37+
<Content Include="../IronMeta.App/bin/Release/net48/IronMeta.Library.dll">
38+
<PackagePath>tools/net48</PackagePath>
3239
</Content>
33-
<Content Include="..\IronMeta.App\bin\Release\net48\Verophyle.Regexp.dll">
34-
<PackagePath>tools\net48</PackagePath>
40+
<Content Include="../IronMeta.App/bin/Release/net48/Verophyle.Regexp.dll">
41+
<PackagePath>tools/net48</PackagePath>
3542
</Content>
3643

37-
<Content Include="..\IronMeta.App\bin\Release\net5.0\IronMeta.App.exe" Condition=" '$(OS)' == 'Windows_NT' ">
44+
<Content Include="../IronMeta.App/bin/Release/net5.0/IronMeta.App.exe" Condition=" '$(OS)' == 'Windows_NT' ">
3845
<PackagePath>tools\net5.0</PackagePath>
3946
</Content>
40-
<Content Include="..\IronMeta.App\bin\Release\net5.0\IronMeta.App.dll">
41-
<PackagePath>tools\net5.0</PackagePath>
47+
<Content Include="../IronMeta.App/bin/Release/net5.0/IronMeta.App.dll">
48+
<PackagePath>tools/net5.0</PackagePath>
4249
</Content>
43-
<Content Include="..\IronMeta.App\bin\Release\net5.0\IronMeta.App.runtimeconfig.json">
44-
<PackagePath>tools\net5.0</PackagePath>
50+
<Content Include="../IronMeta.App/bin/Release/net5.0/IronMeta.App.runtimeconfig.json">
51+
<PackagePath>tools/net5.0</PackagePath>
4552
</Content>
46-
<Content Include="..\IronMeta.App\bin\Release\net5.0\IronMeta.Library.dll">
47-
<PackagePath>tools\net5.0</PackagePath>
53+
<Content Include="../IronMeta.App/bin/Release/net5.0/IronMeta.Library.dll">
54+
<PackagePath>tools/net5.0</PackagePath>
4855
</Content>
49-
<Content Include="..\IronMeta.App\bin\Release\net5.0\Verophyle.Regexp.dll">
50-
<PackagePath>tools\net5.0</PackagePath>
56+
<Content Include="../IronMeta.App/bin/Release/net5.0/Verophyle.Regexp.dll">
57+
<PackagePath>tools/net5.0</PackagePath>
5158
</Content>
5259
</ItemGroup>
5360

-608 Bytes
Binary file not shown.
766 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)