Skip to content

Support arm64 for macOS instead of x64 #67

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 2, 2025
Merged

Support arm64 for macOS instead of x64 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5c511e
Enhance CI workflow to support multiple operating systems in testing
asimmon Apr 2, 2025
8481e78
Targeting macOS arm64
asimmon Apr 2, 2025
fe3699d
Missing arm64 migration
asimmon Apr 2, 2025
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
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@ jobs:
include-hidden-files: true

test:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
needs: [pack]
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v4

Expand Down
6 changes: 3 additions & 3 deletions build/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,17 @@ public sealed class DownloadMongoTask : AsyncFrostingTask<BuildContext>
[
// MongoDB 8.x
new ProjectInfo("EphemeralMongo8.runtime.win-x64", "windows", "x86_64", "base", 8, "win-x64"),
new ProjectInfo("EphemeralMongo8.runtime.osx-x64", "macos", "x86_64", "base", 8, "osx-x64"),
new ProjectInfo("EphemeralMongo8.runtime.osx-arm64", "macos", "arm64", "base", 8, "osx-arm64"),
new ProjectInfo("EphemeralMongo8.runtime.linux-x64", "ubuntu2204", "x86_64", "targeted", 8, "linux-x64"),

// MongoDB 7.x
new ProjectInfo("EphemeralMongo7.runtime.win-x64", "windows", "x86_64", "base", 7, "win-x64"),
new ProjectInfo("EphemeralMongo7.runtime.osx-x64", "macos", "x86_64", "base", 7, "osx-x64"),
new ProjectInfo("EphemeralMongo7.runtime.osx-arm64", "macos", "arm64", "base", 7, "osx-arm64"),
new ProjectInfo("EphemeralMongo7.runtime.linux-x64", "ubuntu2204", "x86_64", "targeted", 7, "linux-x64"),

// MongoDB 6.x
new ProjectInfo("EphemeralMongo6.runtime.win-x64", "windows", "x86_64", "base", 6, "win-x64"),
new ProjectInfo("EphemeralMongo6.runtime.osx-x64", "macos", "x86_64", "base", 6, "osx-x64"),
new ProjectInfo("EphemeralMongo6.runtime.osx-arm64", "macos", "arm64", "base", 6, "osx-arm64"),
new ProjectInfo("EphemeralMongo6.runtime.linux-x64", "ubuntu2204", "x86_64", "targeted", 6, "linux-x64"),
];

Expand Down
2 changes: 1 addition & 1 deletion src/EphemeralMongo.Core/MongoExecutableLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ internal sealed class MongoExecutableLocator : IMongoExecutableLocator
{
[OSPlatform.Windows] = "win-x64",
[OSPlatform.Linux] = "linux-x64",
[OSPlatform.OSX] = "osx-x64",
[OSPlatform.OSX] = "osx-arm64",
};

private static string GetMongoExecutableFileName(Dictionary<OSPlatform, string> mappings) =>
Expand Down
0 ...es/EphemeralMongo6.runtime.osx-x64.csproj → .../EphemeralMongo6.runtime.osx-arm64.csproj
View file
Open in desktop
File renamed without changes.
0 ...es/EphemeralMongo7.runtime.osx-x64.csproj → .../EphemeralMongo7.runtime.osx-arm64.csproj
View file
Open in desktop
File renamed without changes.
0 ...es/EphemeralMongo8.runtime.osx-x64.csproj → .../EphemeralMongo8.runtime.osx-arm64.csproj
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/EphemeralMongo.Runtimes/build/copy-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('Windows'))">win-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-arm64</_EphemeralMongoRid>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework.TrimEnd(`0123456789`))' == 'net' Or '$(TargetFrameworkVersion)' != '' ">
Expand Down
6 changes: 3 additions & 3 deletions src/EphemeralMongo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtimes", "runtimes", "{81
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo.Core", "EphemeralMongo.Core\EphemeralMongo.Core.csproj", "{E58299B0-E5C5-4358-ACA2-11AA859EAD81}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.osx-x64", "EphemeralMongo.Runtimes\EphemeralMongo6.runtime.osx-x64.csproj", "{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.osx-arm64", "EphemeralMongo.Runtimes\EphemeralMongo6.runtime.osx-arm64.csproj", "{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.linux-x64", "EphemeralMongo.Runtimes\EphemeralMongo6.runtime.linux-x64.csproj", "{6D723CAC-6C36-432B-AF82-FED039080D40}"
EndProject
Expand All @@ -26,15 +26,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7", "Ephemera
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.linux-x64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.linux-x64.csproj", "{14EB9AE5-8BED-4C4F-A8FA-B1CAA7CDDB31}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.osx-x64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.osx-x64.csproj", "{0772619C-E004-474A-AC00-4974C545C825}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.osx-arm64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.osx-arm64.csproj", "{0772619C-E004-474A-AC00-4974C545C825}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.win-x64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.win-x64.csproj", "{CDDDD084-72FE-4BBB-9239-4B9D038C8F16}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo8", "EphemeralMongo8\EphemeralMongo8.csproj", "{61D2DBAB-B085-419D-81F0-184B293923B4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo8.runtime.linux-x64", "EphemeralMongo.Runtimes\EphemeralMongo8.runtime.linux-x64.csproj", "{FBEBBD3B-68F1-4DC7-B76F-BFB4DC5D7564}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo8.runtime.osx-x64", "EphemeralMongo.Runtimes\EphemeralMongo8.runtime.osx-x64.csproj", "{053FFBCB-EBB4-4B0F-8AD1-ED35AF0BE6F1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo8.runtime.osx-arm64", "EphemeralMongo.Runtimes\EphemeralMongo8.runtime.osx-arm64.csproj", "{053FFBCB-EBB4-4B0F-8AD1-ED35AF0BE6F1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo8.runtime.win-x64", "EphemeralMongo.Runtimes\EphemeralMongo8.runtime.win-x64.csproj", "{934F2444-D4EC-4D67-BEE3-C089FC5E61B8}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion src/EphemeralMongo6/EphemeralMongo6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<ProjectReference Include="..\EphemeralMongo.Core\EphemeralMongo.Core.csproj" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.linux-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-arm64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.win-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EphemeralMongo7/EphemeralMongo7.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<ProjectReference Include="..\EphemeralMongo.Core\EphemeralMongo.Core.csproj" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.linux-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-arm64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.win-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EphemeralMongo8/EphemeralMongo8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<ProjectReference Include="..\EphemeralMongo.Core\EphemeralMongo.Core.csproj" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.linux-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-arm64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.win-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>

Expand Down