Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Evaluate Apple Silicon for CI #1693

Merged
merged 31 commits into from
Oct 10, 2023
Merged

Evaluate Apple Silicon for CI #1693

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9e82721
Evaluate Apple Silicon for CI
Perksey Oct 2, 2023
157a2bc
Let's see what happens if we don't install old .NET versions
Perksey Oct 2, 2023
5b95eca
sus error message on .NET 6
Perksey Oct 2, 2023
ac4736d
BinaryFormatter 🤮🤮🤮
Perksey Oct 2, 2023
49287c5
Work around some deficiencies in the RC1 SDK (dotnet/sdk#35811)
Perksey Oct 2, 2023
6f91a07
oops
Perksey Oct 2, 2023
ea11612
github.dev find+replace does not work
Perksey Oct 2, 2023
9059f13
Maths unit tests are now .NET 8
Perksey Oct 2, 2023
dd5535b
Vulkan unit tests are now .NET 8
Perksey Oct 2, 2023
f818f9b
Ok let's just disable tests for now
Perksey Oct 2, 2023
f7faa5e
Don't forget the public API!
Perksey Oct 2, 2023
b1059f9
Attempt to fix android, as well as cache to make faster maybe
Perksey Oct 3, 2023
ec8602b
Install Android platforms
Perksey Oct 3, 2023
24c55ca
Reenable .NET 6?
Perksey Oct 3, 2023
4c822b5
Install workloads for .NET 6 and .NET 8
Perksey Oct 3, 2023
507c061
Comical hack
Perksey Oct 3, 2023
619bea8
ANNIHILATE .NET 8
Perksey Oct 3, 2023
bf800a6
Install Android 31
Perksey Oct 3, 2023
1880df0
Maybe the tests are fine on .NET 6?
Perksey Oct 3, 2023
de229e2
they were not fine
Perksey Oct 3, 2023
84151b7
Forgo Apple Silicon for now
Perksey Oct 3, 2023
cb9d281
Apparently caching is slower than JUST DOING IT
Perksey Oct 4, 2023
85b722c
Fix a very sus unit test failure
Perksey Oct 6, 2023
c734897
Just testing something...
Perksey Oct 6, 2023
2217b55
Update build.yml
Perksey Oct 6, 2023
ff0859c
attempt 2
Perksey Oct 6, 2023
d49beee
Tinker with Apple Silicon again
Perksey Oct 9, 2023
c799785
Detailed verbosity, will probably regret this
Perksey Oct 9, 2023
d7e3a3d
Merge branch 'main' into hotfix/apple-silicon-xlarge-runner
Perksey Oct 9, 2023
c709905
Update .NET 6
Perksey Oct 9, 2023
c3a1dc0
Update build/nuke/Build.Support.cs
Perksey Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into hotfix/apple-silicon-xlarge-runner
  • Loading branch information
@Perksey
Perksey committed Oct 9, 2023
commit d7e3a3d4da6fa3b243151adca836d6d205fdcb5b
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
packages: write
jobs:
Build:
runs-on: macos-latest-xlarge
runs-on: macos-13-xlarge
steps:
- uses: actions/[email protected]
with:
Expand Down Expand Up @@ -58,7 +58,8 @@ jobs:
- name: Pack (CI)
if: ${{ github.repository != 'dotnet/Silk.NET' || !startsWith(github.ref, 'refs/tags/') }}
# TODO build native mixins such as BuildLibSilkDroid
run: ./build.sh Pack --configuration Release --msbuild-properties VersionSuffix=build${{ github.run_number }}.0 ContinuousIntegrationBuild=true
# Use a release NUKE so it doesn't interfere with the debug build
run: dotnet run --project build/nuke/Silk.NET.NUKE.csproj -c Release -- Pack --configuration Debug --msbuild-properties VersionSuffix=build${{ github.run_number }}.0 ContinuousIntegrationBuild=true
env:
ANDROID_HOME: /Users/runner/Library/Android/sdk
- name: Pack (CD)
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.