Skip to content

Commit

Permalink
Revert "Implement macOS as a build target"
Browse files Browse the repository at this point in the history
This reverts commit 1620b37.

After some initial testing - it was found that Rosetta stores it's application translation files in a temporary directory that PLRPC couldn't write to. While this is a problem, the underlying issue is with the updater, as it attempts to write a manifest file to the working directory of the application. Seeing as this can't be done, it was determined that changes to the updater should be made before macOS support be implemented.

Reopening #36.
  • Loading branch information
sudokoko committed Aug 15, 2023
1 parent d82ec23 commit b6188fb
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 78 deletions.
34 changes: 8 additions & 26 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,36 +48,25 @@ jobs:
run: dotnet publish -c Release -r win-x64 --self-contained PLRPC.CLI
- name: Publish CLI for Linux x64
run: dotnet publish -c Release -r linux-x64 --self-contained PLRPC.CLI
- name: Publish CLI for macOS x64
run: dotnet publish -c Release -r osx-x64 --self-contained PLRPC.CLI
- name: Publish GUI for Windows x64
run: dotnet publish -c Release -r win-x64 --self-contained PLRPC.GUI.Windows
- name: Publish GUI for Linux x64
run: dotnet publish -c Release -r linux-x64 --self-contained PLRPC.GUI.Linux
- name: Publish GUI for macOS x64
run: dotnet publish -c Release -r osx-x64 --self-contained PLRPC.GUI.MacOS

- name: Upload Windows x64 CLI build
uses: actions/[email protected]
with:
name: PLRPC CLI Windows x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/win-x64/publish/"
if-no-files-found: error
retention-days: 3
name: PLRPC CLI Windows x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/win-x64/publish/"
if-no-files-found: error
retention-days: 3
- name: Upload Linux x64 CLI build
uses: actions/[email protected]
with:
name: PLRPC CLI Linux x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/linux-x64/publish/"
if-no-files-found: error
retention-days: 3
- name: Upload macOS x64 CLI build
uses: actions/[email protected]
with:
name: PLRPC CLI macOS x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/osx-x64/publish/"
if-no-files-found: error
retention-days: 3
name: PLRPC CLI Linux x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/linux-x64/publish/"
if-no-files-found: error
retention-days: 3
- name: Upload Windows x64 GUI build
uses: actions/[email protected]
with:
Expand All @@ -91,11 +80,4 @@ jobs:
name: PLRPC GUI Linux x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.GUI.Linux/bin/Release/net7.0/linux-x64/publish/"
if-no-files-found: error
retention-days: 3
- name: Upload macOS x64 GUI build
uses: actions/[email protected]
with:
name: PLRPC GUI macOS x64 [${{ steps.hash.outputs.hash }}]
path: "/home/runner/work/PLRPC/PLRPC/PLRPC.GUI.MacOS/bin/Release/net7.0/osx-x64/publish/"
if-no-files-found: error
retention-days: 3
2 changes: 1 addition & 1 deletion PLRPC.CLI/PLRPC.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<OutputType>Exe</OutputType>
<SelfContained>true</SelfContained>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup>
Expand Down
26 changes: 0 additions & 26 deletions PLRPC.GUI.MacOS/PLRPC.GUI.MacOS.csproj

This file was deleted.

18 changes: 0 additions & 18 deletions PLRPC.GUI.MacOS/Program.cs

This file was deleted.

7 changes: 0 additions & 7 deletions PLRPC.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLRPC.CLI", "PLRPC.CLI\PLRP
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLRPC.Tests", "PLRPC.Tests\PLRPC.Tests.csproj", "{193EDB91-1206-4261-A4F0-870DD984A5EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLRPC.GUI.MacOS", "PLRPC.GUI.MacOS\PLRPC.GUI.MacOS.csproj", "{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -50,10 +48,6 @@ Global
{193EDB91-1206-4261-A4F0-870DD984A5EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{193EDB91-1206-4261-A4F0-870DD984A5EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{193EDB91-1206-4261-A4F0-870DD984A5EF}.Release|Any CPU.Build.0 = Release|Any CPU
{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{20C3CEC9-6328-43A5-AB59-FDCF9D637C40} = {112C0D49-EA43-4443-A1D5-9BCBBEC7A9DB}
Expand All @@ -62,6 +56,5 @@ Global
{60270A0A-A34A-40FB-BF97-F070B1325157} = {074150AA-731C-465B-8599-C41B56657C81}
{93BF7C09-2B70-422B-A16B-58850F3F2169} = {81EFDCFC-CC1D-4B7E-A921-C64660B9BEF5}
{193EDB91-1206-4261-A4F0-870DD984A5EF} = {074150AA-731C-465B-8599-C41B56657C81}
{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39} = {112C0D49-EA43-4443-A1D5-9BCBBEC7A9DB}
EndGlobalSection
EndGlobal

0 comments on commit b6188fb

Please sign in to comment.