From 4a469876ed8fb60802d4db8ad6caf2415de9188a Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 15:19:19 +0300 Subject: [PATCH 01/25] Create dotnet-core.yml --- .github/workflows/dotnet-core.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/dotnet-core.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml new file mode 100644 index 0000000..f734ea7 --- /dev/null +++ b/.github/workflows/dotnet-core.yml @@ -0,0 +1,25 @@ +name: .NET Core + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.101 + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Test + run: dotnet test --no-restore --verbosity normal From 8c975ed245141538619d5e13e35d4bdbdfc1f120 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 16:10:53 +0300 Subject: [PATCH 02/25] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index f734ea7..2ee7c31 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -22,4 +22,4 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - run: dotnet test --no-restore --verbosity normal + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --no-restore --verbosity normal From b51ac28ca25a72024dbbcdbd0d1b72b8a11f2e99 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 17:10:11 +0300 Subject: [PATCH 03/25] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 2ee7c31..88bf5b4 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -22,4 +22,4 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --no-restore --verbosity normal + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release From 2b68caae3f14da72a1084ffc3b856de739f821d3 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 17:24:28 +0300 Subject: [PATCH 04/25] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 88bf5b4..726e473 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -13,10 +13,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core + - name: Setup .NET Core 2 uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.101 + dotnet-version: 2.2.301 + - name: Setup .NET Core 3 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.301 - name: Install dependencies run: dotnet restore - name: Build From f408431558ca2c678c7708d48e92ac0e30ad377f Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 17:34:26 +0300 Subject: [PATCH 05/25] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 726e473..81c1863 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -13,10 +13,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core 2 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 2.2.301 - name: Setup .NET Core 3 uses: actions/setup-dotnet@v1 with: @@ -26,4 +22,4 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp3.1 From b904c06f1d7fc94d4f7b6b22ae4c0ed782c7baa3 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 17:41:57 +0300 Subject: [PATCH 06/25] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 81c1863..b315dc8 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -21,5 +21,11 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - - name: Test - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp3.1 + - name: Test netcoreapp3.1 + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp3.1 --no-restore + - name: Setup .NET Core 2 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 2.2.104 + - name: Test netcoreapp2.1 + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp2.1 --no-restore From 54197b53f95cb61d2fb7d25e65ea52616d7fd1d6 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Tue, 23 Jun 2020 17:50:38 +0300 Subject: [PATCH 07/25] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index b315dc8..40f028f 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -26,6 +26,6 @@ jobs: - name: Setup .NET Core 2 uses: actions/setup-dotnet@v1 with: - dotnet-version: 2.2.104 + dotnet-version: 2.2.301 - name: Test netcoreapp2.1 run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp2.1 --no-restore From d1d3d13947adbf85dc54eec809758c28a348b410 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 10:30:01 +0300 Subject: [PATCH 08/25] Remove appveyor.yml --- .github/workflows/dotnet-core.yml | 10 +++------- appveyor.yml | 13 ------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 appveyor.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 40f028f..a62acf5 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,12 +20,8 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore - - name: Test netcoreapp3.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp3.1 --no-restore - - name: Setup .NET Core 2 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 2.2.301 + run: dotnet build -с Release --no-restore - name: Test netcoreapp2.1 run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp2.1 --no-restore + - name: Test netcoreapp3.1 + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp3.1 --no-restore diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c8b88cb..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: '1.0.0.{build}' -image: Ubuntu -services: - - docker -configuration: Release -environment: - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -build_script: - - dotnet build TestEnvironment.sln -c Release -test_script: - - dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -artifacts: - - path: '**\*.nupkg' \ No newline at end of file From eb7c37998c2f3cd7da1c5e58f87e2ecabe7010f8 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 10:32:52 +0300 Subject: [PATCH 09/25] Fix issues --- .github/workflows/dotnet-core.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a62acf5..0e155e7 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,8 +20,8 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build -с Release --no-restore + run: dotnet build --configuration Release --no-restore - name: Test netcoreapp2.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp2.1 --no-restore + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore - name: Test netcoreapp3.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj -c Release -f netcoreapp3.1 --no-restore + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp3.1 --no-restore From 9737b2e57c08b28723174187c3baa958c43f5aaa Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 10:50:05 +0300 Subject: [PATCH 10/25] Fix build and test for netcoreapp2.1 --- .github/workflows/dotnet-core.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 0e155e7..74eaeca 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -23,5 +23,11 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test netcoreapp2.1 run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore - - name: Test netcoreapp3.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp3.1 --no-restore + - name: Setup .NET Core 3 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 2.1.701 + - name: Build Tests netcoreapp2.1 + run: dotnet build ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore + - name: Test netcoreapp2.1 + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore From c17bec01c2cec704a24497111c8e33dfb3b91625 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 10:53:29 +0300 Subject: [PATCH 11/25] Fix error --- .github/workflows/dotnet-core.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 74eaeca..1d0fbf9 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -21,9 +21,9 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - - name: Test netcoreapp2.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore - - name: Setup .NET Core 3 + - name: Test netcoreapp3.1 + run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp3.1 --no-restore + - name: Setup .NET Core 2 uses: actions/setup-dotnet@v1 with: dotnet-version: 2.1.701 From 6f9e750b6ab86ddc946f7b2d31eca7b7bb9726c3 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 11:02:14 +0300 Subject: [PATCH 12/25] Specify lang version --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 1d0fbf9..c5de549 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -28,6 +28,6 @@ jobs: with: dotnet-version: 2.1.701 - name: Build Tests netcoreapp2.1 - run: dotnet build ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore + run: dotnet build ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore -langversion:preview - name: Test netcoreapp2.1 run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore From 043b538d42296a4e49db0af7728c80b666ed4623 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 11:16:58 +0300 Subject: [PATCH 13/25] Use preview --- .../TestEnvironment.Docker.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj b/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj index 529fd25..5d11c6b 100644 --- a/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj +++ b/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj @@ -3,6 +3,7 @@ netcoreapp2.1;netcoreapp3.1 false + preview From 30dcdd9a3e6f67f0fa684f21322b311af04781c6 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 11:22:35 +0300 Subject: [PATCH 14/25] Remove langver --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index c5de549..1d0fbf9 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -28,6 +28,6 @@ jobs: with: dotnet-version: 2.1.701 - name: Build Tests netcoreapp2.1 - run: dotnet build ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore -langversion:preview + run: dotnet build ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore - name: Test netcoreapp2.1 run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore From dace63b38dc358176ba198df1b6dd08fd2a431e0 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 11:52:34 +0300 Subject: [PATCH 15/25] Fix lang ver --- .github/workflows/dotnet-core.yml | 8 ++++---- Directory.Build.props | 2 +- .../TestEnvironment.Docker.Tests.csproj | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 1d0fbf9..70eb243 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -22,12 +22,12 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test netcoreapp3.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp3.1 --no-restore + run: dotnet test --configuration Release -f netcoreapp3.1 --no-restore - name: Setup .NET Core 2 uses: actions/setup-dotnet@v1 with: - dotnet-version: 2.1.701 + dotnet-version: 2.2.207 - name: Build Tests netcoreapp2.1 - run: dotnet build ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore + run: dotnet build --configuration Release -f netcoreapp2.1 --no-restore - name: Test netcoreapp2.1 - run: dotnet test ./test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj --configuration Release -f netcoreapp2.1 --no-restore + run: dotnet test --configuration Release -f netcoreapp2.1 --no-restore diff --git a/Directory.Build.props b/Directory.Build.props index 8be4943..5b55cde 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ https://github.com/Deffiss/testenvironment-docker True https://github.com/Deffiss/testenvironment-docker - Latest + 8.0 MIT diff --git a/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj b/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj index 5d11c6b..529fd25 100644 --- a/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj +++ b/test/TestEnvironment.Docker.Tests/TestEnvironment.Docker.Tests.csproj @@ -3,7 +3,6 @@ netcoreapp2.1;netcoreapp3.1 false - preview From 6ef40fc815f63075e92d80971b162670ea823bb0 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 12:05:48 +0300 Subject: [PATCH 16/25] Use strategy --- .github/workflows/dotnet-core.yml | 17 ++++++----------- Directory.Build.props | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 70eb243..108d3cf 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -9,11 +9,14 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v2 - - name: Setup .NET Core 3 + - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: dotnet-version: 3.1.301 @@ -21,13 +24,5 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - - name: Test netcoreapp3.1 + - name: Test run: dotnet test --configuration Release -f netcoreapp3.1 --no-restore - - name: Setup .NET Core 2 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 2.2.207 - - name: Build Tests netcoreapp2.1 - run: dotnet build --configuration Release -f netcoreapp2.1 --no-restore - - name: Test netcoreapp2.1 - run: dotnet test --configuration Release -f netcoreapp2.1 --no-restore diff --git a/Directory.Build.props b/Directory.Build.props index 5b55cde..6f27910 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ https://github.com/Deffiss/testenvironment-docker True https://github.com/Deffiss/testenvironment-docker - 8.0 + latest MIT From a3240f9e92be8b692e4320432838d6f5487e16ab Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 12:20:57 +0300 Subject: [PATCH 17/25] Update Directory.Build.props --- Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6f27910..c3bbbf7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ https://github.com/Deffiss/testenvironment-docker True https://github.com/Deffiss/testenvironment-docker - latest + Latest MIT @@ -15,4 +15,4 @@ - \ No newline at end of file + From 4d9b722b06f0c7b2549dd7d659bf56e273ce306f Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 14:21:48 +0300 Subject: [PATCH 18/25] Add publish step --- .github/workflows/{dotnet-core.yml => pr.yml} | 8 ++---- .github/workflows/publish.yml | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) rename .github/workflows/{dotnet-core.yml => pr.yml} (82%) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/pr.yml similarity index 82% rename from .github/workflows/dotnet-core.yml rename to .github/workflows/pr.yml index 108d3cf..df26df7 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/pr.yml @@ -1,18 +1,16 @@ -name: .NET Core +name: PR on: - push: - branches: [ master ] pull_request: branches: [ master ] jobs: - build: + build_and_test: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..0a9c708 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,28 @@ +name: Publish + +on: + push: + branches: [ master, feature/*] + +jobs: + build_and_test_and_publish: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.301 + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Test + run: dotnet test --configuration Release -f netcoreapp3.1 --no-restore + - name: Publish Nuget Packages + run: dotnet nuget push **\*.nupkg -k "$env:API_KEY" + env: + API_KEY: ${{ secrets.API_KEY }} + From 000d363de34a55e3916289eb7a751d1c4870d9bf Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 14:29:39 +0300 Subject: [PATCH 19/25] Specify source --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a9c708..9c36320 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: - name: Test run: dotnet test --configuration Release -f netcoreapp3.1 --no-restore - name: Publish Nuget Packages - run: dotnet nuget push **\*.nupkg -k "$env:API_KEY" + run: dotnet nuget push **\*.nupkg -k "$env:API_KEY" -s https://api.nuget.org/v3/index.json env: API_KEY: ${{ secrets.API_KEY }} From c432121c2a8436736ebffaa02ac7f027ecf05d49 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 14:38:31 +0300 Subject: [PATCH 20/25] Skip duplicates --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9c36320..99df5f2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: - name: Test run: dotnet test --configuration Release -f netcoreapp3.1 --no-restore - name: Publish Nuget Packages - run: dotnet nuget push **\*.nupkg -k "$env:API_KEY" -s https://api.nuget.org/v3/index.json + run: dotnet nuget push **\*.nupkg -k "$env:API_KEY" -s https://api.nuget.org/v3/index.json --skip-duplicate env: API_KEY: ${{ secrets.API_KEY }} From 57fd664431377bc6bb62eded81376bc70a115a1e Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 14:48:49 +0300 Subject: [PATCH 21/25] Fix env --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 99df5f2..efd59d3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: - name: Test run: dotnet test --configuration Release -f netcoreapp3.1 --no-restore - name: Publish Nuget Packages - run: dotnet nuget push **\*.nupkg -k "$env:API_KEY" -s https://api.nuget.org/v3/index.json --skip-duplicate + run: dotnet nuget push **\*.nupkg -k "$API_KEY" -s https://api.nuget.org/v3/index.json --skip-duplicate env: API_KEY: ${{ secrets.API_KEY }} From b578a493096793047c9a3e7313594c7392ad7628 Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 15:57:12 +0300 Subject: [PATCH 22/25] Some changes to workflows --- .github/workflows/{pr.yml => build.yml} | 4 +++- .github/workflows/publish.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) rename .github/workflows/{pr.yml => build.yml} (92%) diff --git a/.github/workflows/pr.yml b/.github/workflows/build.yml similarity index 92% rename from .github/workflows/pr.yml rename to .github/workflows/build.yml index df26df7..74550d7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,10 @@ -name: PR +name: Build on: pull_request: branches: [ master ] + push: + branches: [ master ] jobs: build_and_test: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index efd59d3..ce1f1c4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish on: push: - branches: [ master, feature/*] + tags: [ ** ] jobs: build_and_test_and_publish: From da7beea6e95a32a86d7957d9189380097076791b Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 16:00:47 +0300 Subject: [PATCH 23/25] Fix yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ce1f1c4..8fa6f47 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish on: push: - tags: [ ** ] + tags: ['**'] jobs: build_and_test_and_publish: From 4ac46e9b143c58c1c6e546d8536287c76d7a231b Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 16:32:10 +0300 Subject: [PATCH 24/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 678e9f7..41a53d6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build status](https://ci.appveyor.com/api/projects/status/1xh2d15gkmij0mp8/branch/master?svg=true)](https://ci.appveyor.com/project/Deffiss/testenvironment-docker/branch/master) [![NuGet](https://img.shields.io/nuget/v/TestEnvironment.Docker.svg)](https://www.nuget.org/packages/TestEnvironment.Docker/) +[![Build](https://github.com/Deffiss/testenvironment-docker/workflows/Build/badge.svg) [![NuGet](https://img.shields.io/nuget/v/TestEnvironment.Docker.svg)](https://www.nuget.org/packages/TestEnvironment.Docker/) # Test environment with Docker containers @@ -74,4 +74,4 @@ Ideally, use the [`--filter`](https://docs.docker.com/engine/reference/commandli ### Release Notes -* Implement `IAsyncDisposable` interface. \ No newline at end of file +* Implement `IAsyncDisposable` interface. From 94573fde53a2b7476b25621d9f9f61c08ac216cf Mon Sep 17 00:00:00 2001 From: Aliaksei Harshkalep Date: Thu, 25 Jun 2020 16:35:25 +0300 Subject: [PATCH 25/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41a53d6..f272235 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build](https://github.com/Deffiss/testenvironment-docker/workflows/Build/badge.svg) [![NuGet](https://img.shields.io/nuget/v/TestEnvironment.Docker.svg)](https://www.nuget.org/packages/TestEnvironment.Docker/) +[![Build](https://github.com/Deffiss/testenvironment-docker/workflows/Build/badge.svg)](https://github.com/Deffiss/testenvironment-docker/actions?query=workflow%3ABuild) [![NuGet](https://img.shields.io/nuget/v/TestEnvironment.Docker.svg)](https://www.nuget.org/packages/TestEnvironment.Docker/) # Test environment with Docker containers