Skip to content

💚 Fix CI build #271

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

Open
valentinbreiz wants to merge 5 commits into
base: master
Choose a base branch
from
Open

💚 Fix CI build #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2210b40
💚 Fix CI build
valentinbreiz Feb 6, 2024
e9bde76
💚 Add Cosmos.Plugs package
valentinbreiz Feb 6, 2024
4ec2f8e
💚 Fix AuraOS build
valentinbreiz Feb 6, 2024
092d363
📌 Update package reference version
valentinbreiz Feb 6, 2024
a27a547
Merge branch 'master' into fix/cicd
valentinbreiz Feb 6, 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
16 changes: 12 additions & 4 deletions .github/workflows/dotnet-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [windows-latest]
include:
- os: ubuntu-20.04
target: Linux
- os: windows-latest
target: Windows

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -78,6 +78,7 @@ jobs:
dotnet pack Cosmos.Core_Asm/Cosmos.Core_Asm.csproj --output c:\packages
dotnet pack Cosmos.HAL2/Cosmos.HAL2.csproj --output c:\packages
dotnet pack Cosmos.System2/Cosmos.System2.csproj --output c:\packages
dotnet pack Cosmos.Plugs/Cosmos.Plugs.csproj --output c:\packages
dotnet pack Cosmos.System2_Plugs/Cosmos.System2_Plugs.csproj --output c:\packages
dotnet pack Cosmos.Debug.Kernel/Cosmos.Debug.Kernel.csproj --output c:\packages
dotnet pack Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj --output c:\packages
Expand Down Expand Up @@ -106,13 +107,20 @@ jobs:
Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.System2\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force
Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.HAL2\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force
Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.System2_Plugs\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force
Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.Plugs\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force
Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.Debug.Kernel\bin\Debug\netstandard2.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force
Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.Debug.Kernel.Plugs.Asm\bin\Debug\netstandard2.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force
- name: Restore dependancies
run: |
cd "SRC"
dotnet restore
- name: Build Aura Operating System
if: ${{ matrix.os == 'windows-latest' }}
run: |
cd "SRC"
dotnet build
- name: Build Aura Operating System
if: ${{ matrix.os == 'ubuntu-20.04' }}
run: |
cd "SRC"
sudo dotnet build --no-restore
sudo dotnet build
88 changes: 44 additions & 44 deletions SRC/Aura_Boot/Aura_Boot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<SelfContained>True</SelfContained>
<Profile>VMware</Profile>
<BinFormat>ELF</BinFormat>
<StackCorruptionDetectionEnabled>False</StackCorruptionDetectionEnabled>
<StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
<Deployment>ISO</Deployment>
<DebugEnabled>False</DebugEnabled>
<DebugMode>Source</DebugMode>
<IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
<ISOFile>bin\Debug\net6.0\Aura_Boot.iso</ISOFile>
<CompileVBEMultiboot>False</CompileVBEMultiboot>
<ExtractMapFile>False</ExtractMapFile>
<Launch>VMware</Launch>
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
<VMwareEdition>Workstation</VMwareEdition>
<EnableGDB>False</EnableGDB>
<StartCosmosGDB>False</StartCosmosGDB>
<VBEResolution>1920x1080x32</VBEResolution>
<OptimizationLevel>3</OptimizationLevel>
<Timeout>0</Timeout>
<RemoveBootDebugOutput>True</RemoveBootDebugOutput>
<CompressionType>Gzip</CompressionType>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<SelfContained>True</SelfContained>
<Profile>VMware</Profile>
<BinFormat>ELF</BinFormat>
<StackCorruptionDetectionEnabled>False</StackCorruptionDetectionEnabled>
<StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
<Deployment>ISO</Deployment>
<DebugEnabled>False</DebugEnabled>
<DebugMode>Source</DebugMode>
<IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
<ISOFile>bin\Debug\net6.0\Aura_Boot.iso</ISOFile>
<CompileVBEMultiboot>False</CompileVBEMultiboot>
<ExtractMapFile>False</ExtractMapFile>
<Launch>VMware</Launch>
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
<VMwareEdition>Workstation</VMwareEdition>
<EnableGDB>False</EnableGDB>
<StartCosmosGDB>False</StartCosmosGDB>
<VBEResolution>1920x1080x32</VBEResolution>
<OptimizationLevel>3</OptimizationLevel>
<Timeout>0</Timeout>
<RemoveBootDebugOutput>True</RemoveBootDebugOutput>
<CompressionType>Gzip</CompressionType>
</PropertyGroup>

<ItemGroup>
<None Remove="isoFiles\Tetris.gb" />
</ItemGroup>
<ItemGroup>
<None Remove="isoFiles\Tetris.gb" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="isoFiles\Tetris.gb" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="isoFiles\Tetris.gb" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Cosmos.Build" Version="0.1.0-localbuild*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.Debug.Kernel" Version="0.1.0-localbuild*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.System2" Version="0.1.0-localbuild*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.Plugs" Version="0.1.0-localbuild*" NoWarn="NU1604" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Cosmos.Build" Version="0.1.0-localbuild*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.Debug.Kernel" Version="0.1.0-localbuild*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.System2" Version="0.1.0-localbuild*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.Plugs" Version="0.1.0-localbuild*" NoWarn="NU1604" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Aura_OS\Aura_OS.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Aura_OS\Aura_OS.csproj" />
</ItemGroup>

<ItemGroup>
<PlugsReference Include="$(MSBuildProjectDirectory)\..\Aura_Plugs\bin\Debug\net6.0\Aura_Plugs.dll" />
</ItemGroup>
<ItemGroup>
<PlugsReference Include="$(MSBuildProjectDirectory)\..\Aura_Plugs\bin\Debug\net6.0\Aura_Plugs.dll" />
</ItemGroup>

</Project>
32 changes: 16 additions & 16 deletions SRC/Aura_OS/Aura_OS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project InitialTargets="GetVersion" Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<DefineConstants>TRACE;NOASYNC</DefineConstants>
</PropertyGroup>
</PropertyGroup>

<PropertyGroup>
<Year>$([System.DateTime]::Now.ToString("yyyy"))</Year>
Expand All @@ -24,23 +24,23 @@
</PropertyGroup>

<ItemGroup>
<None Remove="Resources\wallpaper-1.bmp" />
<None Remove="Resources\wallpaper-1.bmp" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\error.bmp" />
<EmbeddedResource Include="Resources\Tetris.gb" />
<EmbeddedResource Include="Resources\wallpaper1920.bmp" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\error.bmp" />
<EmbeddedResource Include="Resources\Tetris.gb" />
<EmbeddedResource Include="Resources\wallpaper1920.bmp" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="acryptohashnet" Version="2.0.0" />
<PackageReference Include="Cosmos.System2" Version="0.1.0-localbuild*" NoWarn="NU1604;NU1605" />
<PackageReference Include="CosmosHttp" Version="1.0.4" />
<ItemGroup>
<PackageReference Include="acryptohashnet" Version="2.0.0" />
<PackageReference Include="Cosmos.System2" Version="0.1.0-localbuild*" NoWarn="NU1604;NU1605" />
<PackageReference Include="CosmosHttp" Version="1.0.4" />
<PackageReference Include="CosmosFtpServer" Version="1.0.9" />
<PackageReference Include="jzero" Version="0.4.5" />
<PackageReference Include="Zlib.Portable" Version="1.11.0" />
</ItemGroup>
<PackageReference Include="jzero" Version="0.4.5" />
<PackageReference Include="Zlib.Portable" Version="1.11.0" />
</ItemGroup>

<Target Name="GetVersion">
<WriteLinesToFile File="Properties\VersionInfo.cs" Lines="$(SomeThing)" Overwrite="true" />
Expand Down
2 changes: 1 addition & 1 deletion SRC/Aura_OS/Properties/VersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ namespace Aura_OS
{
public class VersionInfo
{
public static string revision = "060220241610";
public static string revision = "060220241709";
}
}