Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back macOS and Windows CI #4101

Merged
merged 12 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/test/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ runs:
- name: 🧪 Test Slice Compiler
run: cargo test --manifest-path tools/slicec-cs/Cargo.toml
shell: bash

- name: 🧪 Test
run: dotnet test --no-build --verbosity normal --blame-hang-timeout 10s
shell: bash

- name: Upload blame hang dumps
uses: actions/upload-artifact@v4
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

# env:
# MSBUILDDISABLENODEREUSE: 1

jobs:
build_and_test:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 15
steps:
Expand Down
19 changes: 14 additions & 5 deletions tests/IceRpc.Tests/Transports/Tcp/TcpTransportConformanceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using NUnit.Framework;
using System.Net;
using System.Net.Sockets;
using System.Runtime.InteropServices;

namespace IceRpc.Tests.Transports.Tcp;

Expand Down Expand Up @@ -48,16 +49,24 @@ protected override IServiceCollection CreateServiceCollection(int? listenBacklog

internal class Ipv6SupportFixture
{

public static void FixtureSetUp()
{
using var socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
try
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
socket.Bind(new IPEndPoint(IPAddress.IPv6Loopback, 0));
Assert.Ignore("IPv6 is not supported on macOS");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add a reference to the relevant bug with a TODO to revert this once the fix makes it to 8.0

dotnet/runtime#102663

}
catch
else
{
Assert.Ignore("IPv6 is not supported on this platform");
using var socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
try
{
socket.Bind(new IPEndPoint(IPAddress.IPv6Loopback, 0));
}
catch
{
Assert.Ignore("IPv6 is not supported on this platform");
}
}
}
}
Loading