Skip to content

Commit

Permalink
clean up x64 dotnet usage
Browse files Browse the repository at this point in the history
  • Loading branch information
dellis1972 committed Aug 13, 2024
1 parent ce7d3e5 commit e9c2483
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,32 +54,32 @@ jobs:
run: |
wget https://dot.net/v1/dotnet-install.sh
chmod u+x dotnet-install.sh
./dotnet-install.sh --architecture x64 --install-dir $GITHUB_WORKSPACE/dotnet64 --version latest
./dotnet-install.sh --architecture x64 --install-dir ${{github.workspace}}/dotnet64 --version latest
if: runner.os != 'Windows'

- name: Install required workloads
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
$GITHUB_WORKSPACE/dotnet64/dotnet workload install android
${{github.workspace}}/dotnet64/dotnet workload install android
elif [ "$RUNNER_OS" == "Windows" ]; then
dotnet.exe workload install android ios macos
else
$GITHUB_WORKSPACE/dotnet64/dotnet workload install android ios macos
${{github.workspace}}/dotnet64/dotnet workload install android ios macos
fi
shell: bash

- name: Build
run: $GITHUB_WORKSPACE/dotnet64/dotnet run --project build/Build.csproj -- --target=Default
run: ${{github.workspace}}/dotnet64/dotnet run --project build/Build.csproj -- --target=Default
if: runner.os != 'Windows'

- name: Build
run: dotnet run --project build/Build.csproj -- --target=Default
if: runner.os == 'Windows'

- name: Test
run: $GITHUB_WORKSPACE/dotnet64/dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj -p:WarningLevel=0 --blame-hang-timeout 1m
run: ${{github.workspace}}/dotnet64/dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj -p:WarningLevel=0 --blame-hang-timeout 1m
env:
DOTNET_ROOT: $GITHUB_WORKSPACE/dotnet64
DOTNET_ROOT: ${{github.workspace}}/dotnet64
if: runner.os != 'Windows'

- name: Test
Expand Down

0 comments on commit e9c2483

Please sign in to comment.