From d232d29d5a9a3b11d4bbb3f10d9107bdf0077301 Mon Sep 17 00:00:00 2001 From: James Gould Date: Sun, 9 Feb 2025 19:02:55 +0000 Subject: [PATCH] Fix CI build by skipping Bad Test (#692) --- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 2 +- src/Docker.DotNet/Docker.DotNet.csproj | 6 +++--- src/Docker.DotNet/Models/RestartPolicyKind.cs | 3 --- test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj | 6 +++--- test/Docker.DotNet.Tests/ISystemOperations.Tests.cs | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 754cbca42..365168748 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Build run: dotnet build -c Release - name: Test diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1f2e37526..2beff68e3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Install SignClient tool run: dotnet tool install --tool-path . SignClient - name: Install NBGV tool diff --git a/src/Docker.DotNet/Docker.DotNet.csproj b/src/Docker.DotNet/Docker.DotNet.csproj index 14b531e2f..2237859c4 100644 --- a/src/Docker.DotNet/Docker.DotNet.csproj +++ b/src/Docker.DotNet/Docker.DotNet.csproj @@ -6,8 +6,8 @@ - - - + + + \ No newline at end of file diff --git a/src/Docker.DotNet/Models/RestartPolicyKind.cs b/src/Docker.DotNet/Models/RestartPolicyKind.cs index d7f391784..79b07e9f4 100644 --- a/src/Docker.DotNet/Models/RestartPolicyKind.cs +++ b/src/Docker.DotNet/Models/RestartPolicyKind.cs @@ -5,9 +5,6 @@ namespace Docker.DotNet.Models public enum RestartPolicyKind { - [EnumMember(Value = "")] - Undefined, - [EnumMember(Value = "no")] No, diff --git a/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj b/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj index 58b7a5209..0814769bc 100644 --- a/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj +++ b/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj @@ -1,11 +1,11 @@  - net6.0 + net8.0 - + - + diff --git a/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs b/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs index bcf394068..98980d2f4 100644 --- a/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs +++ b/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs @@ -37,7 +37,7 @@ public ISystemOperationsTests(TestFixture testFixture, ITestOutputHelper outputH _tag = testFixture.Tag; } - [Fact] + [Fact(Skip = "docker.exe not always a live process")] public void Docker_IsRunning() { var dockerProcess = Process.GetProcesses().FirstOrDefault(_ => _.ProcessName.Equals("docker", StringComparison.InvariantCultureIgnoreCase) || _.ProcessName.Equals("dockerd", StringComparison.InvariantCultureIgnoreCase));