Skip to content

Commit

Permalink
feat: Enable builds on LINUX with dotnet 🥳🐧
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanRynne committed May 27, 2024
1 parent c6fa641 commit 3f0df96
Show file tree
Hide file tree
Showing 17 changed files with 517 additions and 12 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: .NET Build and Publish
on:
push:
branches: ["main", "dev", "dui3/alpha"]
pull_request:
pull_request:
branches:
- dui3/alpha

jobs:
build-and-publish:
runs-on: windows-latest
runs-on: ubuntu-latest

steps:
- name: Checkout
Expand All @@ -26,12 +26,12 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

- name : Install GitVersion
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.x'
versionSpec: "5.x"

- name: Determine Version
id: version
Expand All @@ -43,9 +43,6 @@ jobs:
- name: Restore
run: ./build.ps1 restore

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Build
env:
VERSION: ${{ env.fullSemVer }}
Expand All @@ -61,6 +58,6 @@ jobs:
name: output-${{ env.fullSemVer }}
path: output/*.*
compression-level: 0 # no compression

- name: Trigger Build Installers
run: ./build.ps1 build-installers ${{ secrets.CONNECTORS_GH_TOKEN }} ${{ github.run_id }} ${{ env.fullSemVer }}
4 changes: 2 additions & 2 deletions Build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ void RemoveDirectory(string d)
var fileVersion = Environment.GetEnvironmentVariable("FILE_VERSION");
Console.WriteLine($"Version: {version} & {fileVersion}");
Run(
"msbuild",
$"{s} /p:Configuration=Release /p:RestoreLockedMode=true /p:IsDesktopBuild=false /p:NuGetRestorePackages=false /p:Version={version} /p:FileVersion={fileVersion} -v:m"
"dotnet",
$"build {s} --no-restore -c Release -p:IsDesktopBuild=false -p:Version={version} -p:FileVersion={fileVersion} -v:m"
);
}
);
Expand Down
14 changes: 14 additions & 0 deletions Core/Tests/Speckle.Core.Tests.Performance/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Microsoft.NETFramework.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
"dependencies": {
"Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
}
},
"BenchmarkDotNet.Annotations": {
"type": "Transitive",
"resolved": "0.13.12",
Expand Down Expand Up @@ -232,6 +241,11 @@
"System.Runtime.CompilerServices.Unsafe": "4.5.1"
}
},
"Microsoft.NETFramework.ReferenceAssemblies.net48": {
"type": "Transitive",
"resolved": "1.0.3",
"contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
},
"Microsoft.Win32.Registry": {
"type": "Transitive",
"resolved": "5.0.0",
Expand Down
Loading

0 comments on commit 3f0df96

Please sign in to comment.