Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dd/gh-net-release
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisInSky committed Nov 27, 2024
2 parents 36296ff + bd6bf34 commit fb759ac
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 36 deletions.
28 changes: 9 additions & 19 deletions .github/workflows/net-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build_test:
name: Build & Test
name: Test Managed Code
runs-on: ubuntu-latest
permissions:
packages: read
Expand All @@ -34,28 +34,18 @@ jobs:
with:
dotnet-version: 8.0.x

- name: Set Up NuGet Sources
run: |
NUGET_SOURCE_URL="https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
dotnet nuget remove source ${{ github.repository_owner }}-github || true
dotnet nuget add source $NUGET_SOURCE_URL \
--name ${{ github.repository_owner }}-github \
--username "${{ github.workflow }}" \
--password ${{ secrets.GITHUB_TOKEN }} \
--store-password-in-clear-text
- name: Restore Solution
run: |
dotnet restore
- name: Build Solution
run: >-
run: |
dotnet build --no-restore --configuration Debug
- name: Test Solution
run: >-
dotnet test --no-build --configuration Debug
--logger "trx;LogFileName=TestResults.trx"
run: |
dotnet test --no-build --configuration Debug \
--logger "trx;LogFileName=TestResults.trx"
- name: Upload Test Results
if: ${{ success() || failure() }}
Expand All @@ -67,7 +57,7 @@ jobs:
!net/**/Sails.Tests.Shared/**/*.trx
build_win_x64:
name: Build Native Libraries for Win x64
name: Test Native Libraries for Win x64
runs-on: windows-latest
steps:
- name: Checkout Code
Expand All @@ -78,7 +68,7 @@ jobs:
cargo test --locked --manifest-path net/rs/Cargo.toml --release
build_linux_x64:
name: Build Native Libraries for Linux x64
name: Test Native Libraries for Linux x64
runs-on: ubuntu-latest
steps:
- name: Checkout Code
Expand All @@ -89,7 +79,7 @@ jobs:
cargo test --locked --manifest-path net/rs/Cargo.toml --release
build_osx_x64:
name: Build Native Libraries for NacOS x64
name: Test Native Libraries for NacOS x64
runs-on: macos-latest
steps:
- name: Checkout Code
Expand All @@ -101,7 +91,7 @@ jobs:
cargo test --locked --manifest-path net/rs/Cargo.toml --release --target x86_64-apple-darwin
build_osx_arm64:
name: Build Native Libraries for MacOS ARM64
name: Test Native Libraries for MacOS ARM64
runs-on: macos-latest
steps:
- name: Checkout Code
Expand Down
4 changes: 2 additions & 2 deletions net/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageVersion Include="MessagePack" Version="2.5.192" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<!-- Examples -->
<PackageVersion Include="Sails.ClientGenerator" Version="0.0.1-beta.2" />
<PackageVersion Include="Sails.Net" Version="0.0.1-beta.2" />
<PackageVersion Include="Sails.ClientGenerator" Version="0.0.1-beta.3" />
<PackageVersion Include="Sails.Net" Version="0.0.1-beta.3" />
</ItemGroup>
</Project>
15 changes: 0 additions & 15 deletions nuget.config

This file was deleted.

0 comments on commit fb759ac

Please sign in to comment.