Skip to content

Commit

Permalink
Merge branch 'dui3/alpha' into rhino-interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
adamhathcock authored Jun 20, 2024
2 parents 23a8211 + cc81dc2 commit eaa0b1e
Show file tree
Hide file tree
Showing 21 changed files with 8,751 additions and 4 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: windows-latest
outputs:
version: ${{ steps.set-version.outputs.version }}
steps:
Expand All @@ -25,11 +25,20 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)

- name: Cache Nuget
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: ⚒️ Run GitVersion
run: ./build.sh build-server-version
run: ./build.ps1 build-server-version

- name: ⚒️ Run build
run: ./build.sh
run: ./build.ps1

- name: ⬆️ Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion Build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void RemoveDirectory(string d)
Consts.Solutions,
s =>
{
Run("dotnet", $"restore {s}");
Run("dotnet", $"restore {s} --locked-mode");
}
);

Expand Down
Loading

0 comments on commit eaa0b1e

Please sign in to comment.