ci(build): use correct path for NMH & only uplioad SnapX.GTK4 on Linux

BrycensRanch · Dec 24, 2024 · 1fc5824 · 1fc5824
1 parent 2d76b2c
commit 1fc5824
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
         run: dotnet restore --locked-mode
       # Needed for offline building :3
       - name: Upload Source With Dependencies
-        if: matrix.configuration == 'Debug' && matrix.os == 'ubuntu-24.04'
+        if: matrix.configuration == 'Debug' && runner.os == 'Linux'
         uses: actions/upload-artifact@v4
         with:
           name: SnapX-Vendored-Source
@@ -83,6 +83,7 @@ jobs:
           compression-level: 9
       - name: Upload Publish artifact (GTK4)
         uses: actions/upload-artifact@v4
+        if: runner.os == 'Linux'
         with:
           name: SnapX-GTK4-${{ matrix.configuration }}-${{ runner.os }}-${{ runner.arch }}
           path: "SnapX.GTK4/bin/${{ matrix.configuration }}/**/**/publish"
@@ -91,5 +92,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SnapX-NMH-${{ matrix.configuration }}-${{ runner.os }}-${{ runner.arch }}
-          path: "SnapX.NativeMessagingHost/bin/${{ matrix.configuration }}/**/**/native"
+          path: "SnapX.NativeMessagingHost/bin/${{ matrix.configuration }}/**/**/publish/SnapX_NativeMessagingHost"
           compression-level: 9
diff --git a/SnapX.sln b/SnapX.sln
@@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SnapX.NativeMessagingHost", "SnapX.NativeMessagingHost\SnapX.NativeMessagingHost.csproj", "{254E398D-F7F5-4B2A-9024-5C121EA6C564}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{515655AC-4716-420E-BBA9-318680DBF355}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.CLI", "SnapX.CLI\SnapX.CLI.csproj", "{3AAB8CC5-156D-4738-93D3-625BAA9D2ABD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.Core", "SnapX.Core\SnapX.Core.csproj", "{9C0D2877-B8F3-4D84-BD4C-E89173EBDD96}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.CommonUI", "SnapX.CommonUI\SnapX.CommonUI.csproj", "{74428450-9146-4434-B34F-D9D3213D7B0E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.Avalonia", "SnapX.Avalonia\SnapX.Avalonia.csproj", "{89525D3B-F639-4C0B-8CFF-F55A0C52D344}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.Core", "SnapX.Core\SnapX.Core.csproj", "{9C0D2877-B8F3-4D84-BD4C-E89173EBDD96}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.GTK4", "SnapX.GTK4\SnapX.GTK4.csproj", "{C0EC0A4C-DEC1-4656-B791-EA8FB4A517B1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapX.CLI", "SnapX.CLI\SnapX.CLI.csproj", "{3AAB8CC5-156D-4738-93D3-625BAA9D2ABD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SnapX.NativeMessagingHost", "SnapX.NativeMessagingHost\SnapX.NativeMessagingHost.csproj", "{254E398D-F7F5-4B2A-9024-5C121EA6C564}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU