From 58b35aed6fd08f14dd396232d84090f48ef33c85 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:00:29 +0100 Subject: [PATCH 1/8] ci: use github actions --- .github/workflows/dotnet.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/dotnet.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..a332962 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,25 @@ +name: .NET + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal From 681289782a283076271b6296e39530f1728feda7 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:06:45 +0100 Subject: [PATCH 2/8] ci: update workflow --- .github/workflows/{dotnet.yml => build.yml} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) rename .github/workflows/{dotnet.yml => build.yml} (74%) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/build.yml similarity index 74% rename from .github/workflows/dotnet.yml rename to .github/workflows/build.yml index a332962..369da95 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: .NET +name: build on: push: @@ -6,6 +6,13 @@ on: pull_request: branches: [ main ] +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + +permissions: + contents: read + jobs: build: From b9753d9fb5417918a1edc0ae488120b5abe01729 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:07:07 +0100 Subject: [PATCH 3/8] ci; remove appveyor --- .appveyor.yml | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 98abc3c..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: 1.0.0-{build} -pull_requests: - do_not_increment_build_number: true -branches: - only: - - master - - dev -skip_tags: true -max_jobs: 1 -skip_commits: - files: - - README.md - - CHANGELOG.md - - .editorconfig - - .gitignore - -image: Visual Studio 2017 - -cache: - - '%USERPROFILE%\.nuget\packages -> **\*.csproj' - -init: - - git config --global core.autocrlf true - -nuget: - account_feed: false - project_feed: true - disable_publish_on_pr: true - -configuration: Release - -before_build: - - dotnet --version - - dotnet restore --verbosity m - -build: - verbosity: minimal - publish_nuget: true - publish_nuget_symbols: false - -test: - assemblies: - only: - - 'UnitTests\bin\**\UnitTests.dll' From a407d349d40d02a24fac278f4d35dfd8f49c9c45 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:08:02 +0100 Subject: [PATCH 4/8] docs: update badge --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 046b388..af5adf3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# CSS Parser [![Build status](https://ci.appveyor.com/api/projects/status/vuiq6y07u4xihtbc?svg=true)](https://ci.appveyor.com/project/ViceIce/cssparser) [![](https://img.shields.io/myget/visualon/v/VisualOn.CSSParser.svg?label=MyGet&style=flat)](https://www.myget.org/gallery/visualon) +[![build](https://github.com/visualon/cssparser/actions/workflows/build.yml/badge.svg)](https://github.com/visualon/cssparser/actions/workflows/build.yml) [![](https://img.shields.io/myget/visualon/v/VisualOn.CSSParser.svg?label=MyGet&style=flat)](https://www.myget.org/gallery/visualon) + +# CSS Parser This is a fork from [Dan Roberts](https://bitbucket.org/DanRoberts/cssparser). From a7d290a51c6f9b02a6648f5f6ab75981acc7bcc8 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:12:42 +0100 Subject: [PATCH 5/8] chore: add reference assemblies --- Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 7e0b9dc..5a72b8e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,6 +19,10 @@ $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client + + + + true From b8abe604d4e12ee475e0762006a1825ab62652a6 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:19:38 +0100 Subject: [PATCH 6/8] chore: fix reference --- Directory.Build.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5a72b8e..46e864b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,13 +19,13 @@ $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - - - true $(MSBuildThisFileDirectory)CSSParser.snk + + + + From fc36378b5bb023664139fad1a6906faed1b544b3 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:40:59 +0100 Subject: [PATCH 7/8] chore: add cache and net3.1 runtime --- .editorconfig | 2 +- .github/workflows/build.yml | 35 +++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.editorconfig b/.editorconfig index a8bf009..bf3eadc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,7 +17,7 @@ max_line_length = 160 max_line_length = off trim_trailing_whitespace = false -[*.json] +[*.{json,yml}] indent_size = 2 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 369da95..1c9b82d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: build on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.event.number || github.ref }} @@ -15,18 +15,25 @@ permissions: jobs: build: - runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - name: Setup .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.x - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build --no-restore - - name: Test - run: dotnet test --no-build --verbosity normal + - uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: | + 3.1.x + 6.0.x + + - uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj','**/*.props') }} + + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal From 00aa7e25b56d4116d4d8dea3afe55733f56b2738 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 7 Mar 2022 18:41:22 +0100 Subject: [PATCH 8/8] docs: update changes --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 800e474..4e5841e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - run tests on netcoreapp3.1, net48, net6.0 +- switch to github actions ## 1.0.0 - 2019-01-16 ### Added