From 4aa5f9c0a2e37382026ab2bddee0ae76700ababd Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Sun, 7 Jun 2020 16:56:43 +0200 Subject: [PATCH 01/12] Create dotnet-core.yml --- .github/workflows/dotnet-core.yml | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 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..040d23b --- /dev/null +++ b/.github/workflows/dotnet-core.yml @@ -0,0 +1,41 @@ +name: .NET Core CI + +on: [push, pull_request] + +jobs: + test: + name: .Net Core ${{ matrix.framework }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + framework: ['2.1', '3.1'] + timeout-minutes: 30 + + steps: + - uses: actions/checkout@v2.2.0 + + - name: Setup .NET Core 2.1 + uses: actions/setup-dotnet@v1.5.0 + with: + dotnet-version: 2.1.806 + + - name: Setup .NET Core 3.1 + uses: actions/setup-dotnet@v1.5.0 + with: + dotnet-version: 3.1.300 + + - name: Setup side by side .NET SDKs on Windows + if: matrix.os == 'windows-latest' + run: | + SET DOTNET_21_ROOT=%DOTNET_ROOT:3.1.300=2.1.806% + xcopy /s /y /d %DOTNET_31_ROOT% %DOTNET_ROOT% + shell: cmd + + - name: Setup side by side .NET SDKs on *nix + if: matrix.os != 'windows-latest' + run: | + rsync -a ${DOTNET_ROOT/3.1.300/2.1.806}/* $DOTNET_ROOT/ + + - name: Tests + run: dotnet test --framework netcoreapp${{ matrix.framework }} From deceb72c46cdc0855bb19200a5889c370c5bf208 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Tue, 21 Jul 2020 14:25:32 +0200 Subject: [PATCH 02/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 040d23b..dd7af50 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -18,24 +18,24 @@ jobs: - name: Setup .NET Core 2.1 uses: actions/setup-dotnet@v1.5.0 with: - dotnet-version: 2.1.806 + dotnet-version: 2.1.808 - name: Setup .NET Core 3.1 uses: actions/setup-dotnet@v1.5.0 with: - dotnet-version: 3.1.300 + dotnet-version: 3.1.302 - name: Setup side by side .NET SDKs on Windows if: matrix.os == 'windows-latest' run: | - SET DOTNET_21_ROOT=%DOTNET_ROOT:3.1.300=2.1.806% + SET DOTNET_21_ROOT=%DOTNET_ROOT:3.1.302=2.1.808% xcopy /s /y /d %DOTNET_31_ROOT% %DOTNET_ROOT% shell: cmd - name: Setup side by side .NET SDKs on *nix if: matrix.os != 'windows-latest' run: | - rsync -a ${DOTNET_ROOT/3.1.300/2.1.806}/* $DOTNET_ROOT/ + rsync -a ${DOTNET_ROOT/3.1.302/2.1.808}/* $DOTNET_ROOT/ - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From 08d222d66e06d8aa483b1b5cefc7039d6a2aff98 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Tue, 21 Jul 2020 16:23:36 +0200 Subject: [PATCH 03/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index dd7af50..b0cfe89 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -8,34 +8,17 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest] framework: ['2.1', '3.1'] timeout-minutes: 30 steps: - uses: actions/checkout@v2.2.0 - - name: Setup .NET Core 2.1 + - name: Setup .NET Core uses: actions/setup-dotnet@v1.5.0 with: - dotnet-version: 2.1.808 - - - name: Setup .NET Core 3.1 - uses: actions/setup-dotnet@v1.5.0 - with: - dotnet-version: 3.1.302 - - - name: Setup side by side .NET SDKs on Windows - if: matrix.os == 'windows-latest' - run: | - SET DOTNET_21_ROOT=%DOTNET_ROOT:3.1.302=2.1.808% - xcopy /s /y /d %DOTNET_31_ROOT% %DOTNET_ROOT% - shell: cmd - - - name: Setup side by side .NET SDKs on *nix - if: matrix.os != 'windows-latest' - run: | - rsync -a ${DOTNET_ROOT/3.1.302/2.1.808}/* $DOTNET_ROOT/ + dotnet-version: ${{ matrix.framework }} - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From f753ec9203496dc88ca60bc683e9ff452bedcd69 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 18:54:56 +0200 Subject: [PATCH 04/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index b0cfe89..7de1fc4 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,5 +20,11 @@ jobs: with: dotnet-version: ${{ matrix.framework }} + - if: matrix.os == 'ubuntu-latest' + name: Install Curl + run: | + sudo apt update + sudo apt install -y curl + - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From 4843ba806643d07317900e7c43fbf125fdd56854 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 18:56:15 +0200 Subject: [PATCH 05/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 7de1fc4..b0cfe89 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,11 +20,5 @@ jobs: with: dotnet-version: ${{ matrix.framework }} - - if: matrix.os == 'ubuntu-latest' - name: Install Curl - run: | - sudo apt update - sudo apt install -y curl - - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From 00e1e5835a5ca41a803789cf6dcf257952beada0 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:00:12 +0200 Subject: [PATCH 06/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index b0cfe89..ad1b00c 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,5 +20,11 @@ jobs: with: dotnet-version: ${{ matrix.framework }} + - if: matrix.os == 'ubuntu-latest' + name: Install libcurl + run: | + sudo apt update + sudo apt install -y libcurl3 + - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From d971f9fa87bac7173ce3b5ecef9bd1c47e1553e4 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:00:47 +0200 Subject: [PATCH 07/12] 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 ad1b00c..5f0df4f 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -24,7 +24,7 @@ jobs: name: Install libcurl run: | sudo apt update - sudo apt install -y libcurl3 + sudo apt install -y libcurl4 - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From e3f161c4d1971fe61f23b58f1d2e0a3122fe3b52 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:03:50 +0200 Subject: [PATCH 08/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 5f0df4f..90dc609 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -23,8 +23,7 @@ jobs: - if: matrix.os == 'ubuntu-latest' name: Install libcurl run: | - sudo apt update - sudo apt install -y libcurl4 + sudo apt update && sudo apt install -y libcurl4 - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From ea54db8bed4cacec17b4ea7775e8f9e4c76fb2b9 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:05:09 +0200 Subject: [PATCH 09/12] Update CurlNative.cs --- CurlNet/CurlNative.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CurlNet/CurlNative.cs b/CurlNet/CurlNative.cs index 9cbac12..98055c6 100644 --- a/CurlNet/CurlNative.cs +++ b/CurlNet/CurlNative.cs @@ -9,7 +9,7 @@ namespace CurlNet { internal static class CurlNative { - private const string Libcurl = "libcurl"; + private const string Libcurl = "curl"; [DllImport(Libcurl, EntryPoint = "curl_global_init")] internal static extern CurlCode GlobalInit(CurlGlobal flags); From a75315b34d96e5f90a79c4675eca0ee0edc3699f Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:06:33 +0200 Subject: [PATCH 10/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 90dc609..b0cfe89 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,10 +20,5 @@ jobs: with: dotnet-version: ${{ matrix.framework }} - - if: matrix.os == 'ubuntu-latest' - name: Install libcurl - run: | - sudo apt update && sudo apt install -y libcurl4 - - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From 1b59b8950e12d3fad3b6f8d78a3c4bdc9fb03b63 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:12:25 +0200 Subject: [PATCH 11/12] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index b0cfe89..f9c9079 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,5 +20,10 @@ jobs: with: dotnet-version: ${{ matrix.framework }} + - if: matrix.os == 'ubuntu-latest' + name: Install Linux packages + run: | + ldconfig -l libcurl.so + - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }} From 2bb18d69a989113c446d27bf8794ab1571976bd6 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:14:18 +0200 Subject: [PATCH 12/12] 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 f9c9079..08c0215 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -23,7 +23,7 @@ jobs: - if: matrix.os == 'ubuntu-latest' name: Install Linux packages run: | - ldconfig -l libcurl.so + ldd /usr/bin/curl - name: Tests run: dotnet test --framework netcoreapp${{ matrix.framework }}