Skip to content

Commit dc3255c

Browse files
committed
Merge branch 'xplat_editor' into ourabigdev_xplat-editor
2 parents ba2c592 + 9d35589 commit dc3255c

File tree

80 files changed

+2117
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2117
-447
lines changed

.github/workflows/build-android.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ on:
3333
default: Debug
3434
type: string
3535

36+
concurrency:
37+
group: build-android-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
38+
cancel-in-progress: true
39+
3640
jobs:
3741
#
3842
# Build Stride Runtime for Android

.github/workflows/build-assembly-processor.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ on:
2929
default: Debug
3030
type: string
3131

32+
concurrency:
33+
group: build-assembly-processor-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
34+
cancel-in-progress: true
35+
3236
jobs:
3337
#
3438
# Build Assembly Processor

.github/workflows/build-ios.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ on:
3333
default: Debug
3434
type: string
3535

36+
concurrency:
37+
group: build-ios-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
38+
cancel-in-progress: true
39+
3640
jobs:
3741
#
3842
# Build Stride Runtime for iOS

.github/workflows/build-launcher.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ on:
3131
default: Debug
3232
type: string
3333

34+
concurrency:
35+
group: build-launcher-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
36+
cancel-in-progress: true
37+
3438
jobs:
3539
#
3640
# Build Stride Runtime for Windows

.github/workflows/build-linux-runtime.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ on:
4343
default: OpenGL
4444
type: string
4545

46+
concurrency:
47+
group: build-linux-runtime-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.graphics-api || inputs.graphics-api || 'OpenGL' }}
48+
cancel-in-progress: true
49+
4650
jobs:
4751
#
4852
# Build Stride Runtime for Linux

.github/workflows/build-vs-package.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
default: Debug
2929
type: string
3030

31+
concurrency:
32+
group: build-vs-package-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
33+
cancel-in-progress: true
34+
3135
jobs:
3236
#
3337
# Build Visual Studio Package

.github/workflows/build-windows-full.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
default: Debug
2929
type: string
3030

31+
concurrency:
32+
group: build-windows-full-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
33+
cancel-in-progress: true
34+
3135
jobs:
3236
#
3337
# Build Stride for Windows

.github/workflows/build-windows-runtime.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ on:
4646
default: Direct3D11
4747
type: string
4848

49+
concurrency:
50+
group: build-windows-runtime-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.graphics-api || inputs.graphics-api || 'Direct3D11' }}
51+
cancel-in-progress: true
52+
4953
jobs:
5054
#
5155
# Build Stride Runtime for Windows

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
- '!crowdin.yml'
1818
workflow_dispatch:
1919

20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: true
23+
2024
jobs:
2125
### Misc. ###
2226
Assembly-Processor:

.github/workflows/test-linux.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,17 @@ on:
2626
default: Simple
2727
type: string
2828

29+
concurrency:
30+
group: test-linux-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}
31+
cancel-in-progress: true
32+
2933
jobs:
3034
#
3135
# Test Stride on Linux
3236
#
3337
Linux-Tests:
3438
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' || github.event.pull_request.draft == false }}
35-
name: Test (${{ github.event.inputs.build-type || inputs.build-type }}, ${{ github.event.inputs.test-category || inputs.test-category }})
39+
name: Test (${{ github.event.inputs.build-type || inputs.build-type }}, ${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }})
3640
runs-on: ubuntu-latest
3741
steps:
3842
- uses: actions/checkout@v4
@@ -43,14 +47,14 @@ jobs:
4347
dotnet-version: '8.0.x'
4448
- name: Build
4549
run: |
46-
dotnet build build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category }}.slnf `
50+
dotnet build build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf `
4751
-restore -m:1 -nr:false `
4852
-v:m -p:WarningLevel=0 `
4953
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} `
5054
-p:StridePlatforms=Linux `
5155
-p:StrideGraphicsApis=OpenGL
5256
- name: Test
5357
run: |
54-
dotnet test build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category }}.slnf `
58+
dotnet test build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf `
5559
--no-build `
5660
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }}

0 commit comments

Comments
 (0)