Skip to content

Commit

Permalink
Merge branch 'main' into fp/keypath-filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
papafe committed Feb 8, 2024
2 parents 5d16d4f + fedcd8c commit 8409f36
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/templates/test-net-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
include:
- framework: net7.0
os:
runner: macos-arm
runner: macos-14
runtime: osx-arm64
- framework: net7.0
os:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ name: PR Build
- '!.github/workflows/main.yml'
- '!.github/workflows/publish-*.yml'
- .github/actions/**
- 'Tests/Tests.Android/Properties/AndroidManifest.xml'
- Tests/Tests.Android/Properties/AndroidManifest.xml
env:
REALM_DISABLE_ANALYTICS: true
DOTNET_NOLOGO: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-net-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
include:
- framework: net7.0
os:
runner: macos-arm
runner: macos-14
runtime: osx-arm64
- framework: net7.0
os:
Expand Down

0 comments on commit 8409f36

Please sign in to comment.