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.

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

Jump to bottom

Github Actions 1: Cross Platform Build #2398

Merged
merged 30 commits into from
Aug 23, 2024
Merged

Github Actions 1: Cross Platform Build #2398

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1a1dc1c
Create build.yml
nbollis Aug 16, 2024
9f03bec
Update build.yml
nbollis Aug 16, 2024
ef32654
Update build.yml
nbollis Aug 16, 2024
b3f96e4
Update build.yml
nbollis Aug 16, 2024
659178e
enabled windows targeting to gui and guifunctions
nbollis Aug 16, 2024
52b37f2
Update build.yml
nbollis Aug 16, 2024
063ba81
windows targeting
nbollis Aug 16, 2024
b7ed6e4
Merge branch 'nbollis-patch-1' of https://github.com/smith-chem-wisc/…
nbollis Aug 16, 2024
1c09e60
added new configuration
nbollis Aug 16, 2024
15b643b
Update build.yml
nbollis Aug 16, 2024
1899f0e
Update build.yml
nbollis Aug 16, 2024
ad917f6
Update build.yml
nbollis Aug 16, 2024
c029bc9
Update build.yml
nbollis Aug 16, 2024
90ca745
Update build.yml
nbollis Aug 16, 2024
1bd81bf
Update build.yml
nbollis Aug 16, 2024
f4413d1
Update build.yml
nbollis Aug 16, 2024
be9b088
added test.yml from vs
nbollis Aug 16, 2024
48f13a0
reverterd commit
nbollis Aug 16, 2024
1ef65e8
reverterd commit
nbollis Aug 16, 2024
e49a316
updated some csproj files
nbollis Aug 16, 2024
cc6d167
touched up GUI.csproj
nbollis Aug 16, 2024
7463b4f
Update build.yml
nbollis Aug 16, 2024
71eb360
Merge branch 'master' into nbollis-patch-1
nbollis Aug 19, 2024
807e02b
fixed the test?
nbollis Aug 20, 2024
8b50faa
Changes at alex's suggestion
nbollis Aug 20, 2024
d284894
added back in guifunctions for tests
nbollis Aug 20, 2024
8a91582
removed windows targeting from GUI as it is no longer being built on …
nbollis Aug 20, 2024
5ecc7f7
cleaned up alot
nbollis Aug 20, 2024
04e31e7
did the thing
nbollis Aug 20, 2024
cb03621
Merge branch 'master' into nbollis-patch-1
trishorts Aug 23, 2024
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
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will build a .NET project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net

name: Build

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
include:
- os: ubuntu-latest
configuration: UbuntuMac
- os: macos-latest
configuration: UbuntuMac
- os: windows-latest
configuration: Release

steps:
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.204
- name: Restore dependencies
run: dotnet restore ./MetaMorpheus/MetaMorpheus.sln
- name: Build
run: dotnet build --no-restore ./MetaMorpheus/MetaMorpheus.sln --configuration ${{ matrix.configuration }}
6 changes: 5 additions & 1 deletion MetaMorpheus/CMD/CMD.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ApplicationManifest>app1.manifest</ApplicationManifest>
<Configurations>Debug;Release</Configurations>
<Configurations>Debug;Release;UbuntuMac</Configurations>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<ApplicationIcon></ApplicationIcon>
Expand All @@ -14,6 +14,10 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UbuntuMac|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
6 changes: 5 additions & 1 deletion MetaMorpheus/EngineLayer/EngineLayer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Configurations>Debug;Release</Configurations>
<Configurations>Debug;Release;UbuntuMac</Configurations>
<Version>1.0.0.0</Version>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -12,6 +12,10 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UbuntuMac|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
7 changes: 6 additions & 1 deletion MetaMorpheus/GUI/GUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,21 @@
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<RootNamespace>MetaMorpheusGUI</RootNamespace>
<AssemblyName>MetaMorpheusGUI</AssemblyName>
<Configurations>Debug;Release</Configurations>
<Configurations>Debug;Release;UbuntuMac</Configurations>
nbollis marked this conversation as resolved.
Show resolved Hide resolved
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<ApplicationIcon>Icons\MMnice.ico</ApplicationIcon>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UbuntuMac|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion MetaMorpheus/GuiFunctions/GuiFunctions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<Configurations>Debug;Release</Configurations>
<Configurations>Debug;Release;UbuntuMac</Configurations>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<UseWPF>true</UseWPF>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
15 changes: 15 additions & 0 deletions MetaMorpheus/MetaMorpheus.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,40 +26,55 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
UbuntuMac|Any CPU = UbuntuMac|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.Release|Any CPU.Build.0 = Release|Any CPU
{FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU
{FD20EBBA-F4C5-40D6-AD61-48A7EB255DAE}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU
{C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.Release|Any CPU.Build.0 = Release|Any CPU
{C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU
{C654FC97-FBD1-43D7-9F61-35FDD1A4E0AD}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU
{FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.Release|Any CPU.Build.0 = Release|Any CPU
{FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU
{FFAE3A5E-B5AE-4CD0-ABF9-703C91F1C7D6}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU
{9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.Release|Any CPU.Build.0 = Release|Any CPU
{9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU
{9CD3D75C-4E3C-40AC-A3D8-C32DD528DB7F}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU
{BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.ActiveCfg = Debug|x64
{BE72541A-66A4-4958-9D19-56ACC7D3876B}.Debug|Any CPU.Build.0 = Debug|x64
{BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.ActiveCfg = Release|x64
{BE72541A-66A4-4958-9D19-56ACC7D3876B}.Release|Any CPU.Build.0 = Release|x64
{BE72541A-66A4-4958-9D19-56ACC7D3876B}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|x64
{653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Debug|Any CPU.Build.0 = Debug|Any CPU
{653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.ActiveCfg = Release|Any CPU
{653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.Release|Any CPU.Build.0 = Release|Any CPU
{653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU
{653015B3-CC5A-4D1C-AAD3-1CE2A0C4D197}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU
{7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7EE028A9-75A2-450F-A9A7-76559ED15419}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7EE028A9-75A2-450F-A9A7-76559ED15419}.Release|Any CPU.Build.0 = Release|Any CPU
{7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|Any CPU
{7EE028A9-75A2-450F-A9A7-76559ED15419}.UbuntuMac|Any CPU.Build.0 = UbuntuMac|Any CPU
{E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.ActiveCfg = Debug|x64
{E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Debug|Any CPU.Build.0 = Debug|x64
{E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.ActiveCfg = Release|x64
{E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.Release|Any CPU.Build.0 = Release|x64
{E0EA5AC4-24A9-43DC-8FBC-CCEB3B9935B6}.UbuntuMac|Any CPU.ActiveCfg = UbuntuMac|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 6 additions & 0 deletions MetaMorpheus/MetaMorpheusSetup/MetaMorpheusSetup.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
<SuppressIces>
</SuppressIces>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UbuntuMac|x64'">
<PlatformTarget>x64</PlatformTarget>
nbollis marked this conversation as resolved.
Show resolved Hide resolved
<DefineConstants>Debug</DefineConstants>
<SuppressValidation>true</SuppressValidation>
<SuppressIces />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<PlatformTarget>x64</PlatformTarget>
<SuppressValidation>true</SuppressValidation>
Expand Down
6 changes: 5 additions & 1 deletion MetaMorpheus/TaskLayer/TaskLayer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Configurations>Debug;Release</Configurations>
<Configurations>Debug;Release;UbuntuMac</Configurations>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
Expand All @@ -11,6 +11,10 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UbuntuMac|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion MetaMorpheus/Test/SpectralRecoveryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,8 @@ public static void MiniClassicSearchEngineTest()
[Test]
public static void SpectralWriterTest()
{
foreach (var specLibPath in Directory.GetFiles(outputFolder, "*.msp", SearchOption.AllDirectories))
File.Delete(specLibPath);

PostSearchAnalysisTask postSearchTask = new PostSearchAnalysisTask()
{
Expand Down Expand Up @@ -377,7 +379,7 @@ public static void SpectralWriterTest()
postSearchTask.Run();

var libraryList = Directory.GetFiles(path, "*.*", SearchOption.AllDirectories);
string updateLibraryPath = libraryList.First(p => p.Contains("SpectralLibrary") && !p.Contains(matchingvalue)).ToString();
string updateLibraryPath = libraryList.First(p => p.Contains("updateSpectralLibrary") && !p.Contains(matchingvalue)).ToString();
Copy link
Contributor

Choose a reason for hiding this comment

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

Great change!

var updatedLibraryWithoutDecoy = new SpectralLibrary(new List<string> { Path.Combine(path, updateLibraryPath) });
Assert.That(updatedLibraryWithoutDecoy.TryGetSpectrum("EESGKPGAHVTVK", 2, out spectrum));

Expand Down
7 changes: 6 additions & 1 deletion MetaMorpheus/Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release</Configurations>
<Configurations>Debug;Release;UbuntuMac</Configurations>
<DebugType>full</DebugType>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UbuntuMac|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
Loading