Skip to content

Commit

Permalink
Fix linux cross parsing system headers
Browse files Browse the repository at this point in the history
Update `Startup.cs`


Update `Startup.cs`


Cleanup code


Install linux dependency for cross compiling arm64


Add `/usr/include` directory for parsing Linux targets


Fix linux include directories when parsing


Update `GitVersion.yml`


Update `GitVersion.yml`


Update `GitVerison.yml`


Update `main.yml`


Print filename when test fails


Fix failing tests aarch64 linux


Fix failing tests x64 linux
  • Loading branch information
lithiumtoast committed May 22, 2022
1 parent 196e8e6 commit cb6e0ab
Show file tree
Hide file tree
Showing 31 changed files with 129 additions and 494 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: matrix.platform.os == 'ubuntu-18.04'
run: |
sudo apt-get update
sudo apt-get install gcc-multilib
sudo apt-get install gcc-aarch64-linux-gnu
source "${{ github.workspace }}/scripts/install-clang-x64-ubuntu_18_04.sh"
- name: "Install Clang: macOS"
Expand Down
7 changes: 0 additions & 7 deletions C2CS.sln
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2CS.Contexts.WriteCodeCSha
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2CS.Contexts.ReadCodeC", "src\cs\production\contexts\C2CS.Contexts.ReadCodeC\C2CS.Contexts.ReadCodeC.csproj", "{B366D01D-10B5-4583-B697-82C2C1CFCCB1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2CS.Contexts.BuildLibraryC", "src\cs\production\contexts\C2CS.Contexts.BuildLibraryC\C2CS.Contexts.BuildLibraryC.csproj", "{3BFF236C-631A-4A13-92E3-A612678FF8BC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "generator", "generator", "{8F78AA4E-DC86-4574-ACC5-AD0366CE0E32}"
ProjectSection(SolutionItems) = preProject
src\cs\production\generator\README.md = src\cs\production\generator\README.md
Expand Down Expand Up @@ -111,10 +109,6 @@ Global
{B366D01D-10B5-4583-B697-82C2C1CFCCB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B366D01D-10B5-4583-B697-82C2C1CFCCB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B366D01D-10B5-4583-B697-82C2C1CFCCB1}.Release|Any CPU.Build.0 = Release|Any CPU
{3BFF236C-631A-4A13-92E3-A612678FF8BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3BFF236C-631A-4A13-92E3-A612678FF8BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3BFF236C-631A-4A13-92E3-A612678FF8BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3BFF236C-631A-4A13-92E3-A612678FF8BC}.Release|Any CPU.Build.0 = Release|Any CPU
{27FE6AF5-AE60-4F5C-9D7B-EBD45E10504D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27FE6AF5-AE60-4F5C-9D7B-EBD45E10504D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27FE6AF5-AE60-4F5C-9D7B-EBD45E10504D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -145,7 +139,6 @@ Global
{235C4BC1-5FDB-44AF-89CE-8709E744B8C1} = {5B171977-D7D2-49AB-8D1F-F5831A2E8983}
{06788D2C-2634-42BC-B677-25AACF93E275} = {FF3312B1-10D2-4B8A-AD43-3F6D9CE5E61F}
{B366D01D-10B5-4583-B697-82C2C1CFCCB1} = {FF3312B1-10D2-4B8A-AD43-3F6D9CE5E61F}
{3BFF236C-631A-4A13-92E3-A612678FF8BC} = {FF3312B1-10D2-4B8A-AD43-3F6D9CE5E61F}
{8F78AA4E-DC86-4574-ACC5-AD0366CE0E32} = {0B6FBBF3-28F7-4374-9CDD-3C8B1DFD2AB8}
{27FE6AF5-AE60-4F5C-9D7B-EBD45E10504D} = {8F78AA4E-DC86-4574-ACC5-AD0366CE0E32}
{EA300498-7CA8-42A2-B6E9-F7EB635622F6} = {8F78AA4E-DC86-4574-ACC5-AD0366CE0E32}
Expand Down
2 changes: 2 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ continuous-delivery-fallback-tag: ""
branches:
develop:
regex: '^main$'
increment: Patch
tag: 'alpha'
main:
regex: '^notused$'
ignore:
Expand Down
3 changes: 1 addition & 2 deletions src/cs/production/C2CS/C2CS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
<ItemGroup>
<ProjectReference Include="../contexts/C2CS.Contexts.WriteCodeCSharp/C2CS.Contexts.WriteCodeCSharp.csproj" />
<ProjectReference Include="../contexts/C2CS.Contexts.ReadCodeC/C2CS.Contexts.ReadCodeC.csproj" />
<ProjectReference Include="../contexts/C2CS.Contexts.BuildLibraryC/C2CS.Contexts.BuildLibraryC.csproj" />
<ProjectReference Include="..\infrastructure\C2CS.Infrastructure.Runtime\C2CS.Infrastructure.Runtime.csproj" />
<ProjectReference Include="../infrastructure/C2CS.Infrastructure.Runtime/C2CS.Infrastructure.Runtime.csproj" />
<ProjectReference Include="../infrastructure/C2CS.Infrastructure.Clang/C2CS.Infrastructure.Clang.csproj" />
</ItemGroup>

Expand Down
4 changes: 0 additions & 4 deletions src/cs/production/C2CS/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@
// Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.CommandLine;
using System.IO.Abstractions;
using System.Linq;
using System.Reflection;
using C2CS.Data.Serialization;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -71,6 +68,5 @@ private static void ConfigureServices(IServiceCollection services, string[]? arg

Contexts.ReadCodeC.Startup.ConfigureServices(services);
Contexts.WriteCodeCSharp.Startup.ConfigureServices(services);
Contexts.BuildLibraryC.Startup.ConfigureServices(services);
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit cb6e0ab

Please sign in to comment.