Skip to content

Commit f9e09d3

Browse files
committed
Test with updated workflows and IBT
1 parent 0e0feb1 commit f9e09d3

File tree

4 files changed

+45
-10
lines changed

4 files changed

+45
-10
lines changed

.github/workflows/build-dispatch.yaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ on:
77
description: "Host platform for the build to take place."
88
required: true
99
type: string
10-
target:
11-
description: "Target to be build. (separated by spaces)"
10+
target-platform:
11+
description: "Target platform for which to build. If set no other platforms will be initialized."
12+
required: false
13+
default: 'all'
14+
type: string
15+
targets:
16+
description: "Targets to be build. (separated by spaces)"
1217
required: true
1318
type: string
1419
clang-version:
@@ -18,7 +23,7 @@ on:
1823

1924
jobs:
2025
build:
21-
name: Build (${{ inputs.target }})
26+
name: Build (${{ inputs.targets }})
2227
runs-on: ${{ inputs.host-platform }}
2328
steps:
2429
- name: Checkout Source Code
@@ -38,6 +43,7 @@ jobs:
3843
conan-cache: true
3944
conan-cache-version: 'v1'
4045
conan-config-url: https://github.com/iceshard-engine/conan-config.git
46+
conan-modify-profile: ${{ contains(inputs.host-platform, 'ubuntu') }}
4147
conan-profile-compiler: 'clang'
4248
conan-profile-compiler-version: '${{ inputs.clang-version }}'
4349
conan-profile-cppstd: '20'
@@ -47,12 +53,11 @@ jobs:
4753
uses: iceshard-engine/.github/.github/actions/ibt-wks@main
4854
with:
4955
script_basename: 'ice'
50-
platform-android: ${{ contains(inputs.target, 'android') }}
51-
platform-web: ${{ contains(inputs.target, 'webasm') }}
56+
target-platform: ${{ inputs.target-platform }}
5257
workspace-cache: true
53-
workspace-cache-version: 'v1'
58+
workspace-cache-version: 'v1-${{ inputs.target-platform }}'
5459

5560
# Building the actual target
56-
- name: Build Target (${{ inputs.target }})
61+
- name: Build Targets (${{ inputs.targets }})
5762
shell: pwsh
58-
run: ./ibt-ci build -t ${{ inputs.target }}
63+
run: ./ibt-ci build ${{ inputs.targets }}

.github/workflows/build-manual.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ jobs:
2626
- host: windows-latest
2727
with:
2828
host-platform: ${{ matrix.host }}
29-
target: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ inputs.configuration }}"
29+
target-platform: 'win32'
30+
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ inputs.configuration }}"

.github/workflows/build-validate-code.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ jobs:
2222
config: [Debug,Develop,Profile,Release]
2323
include:
2424
- host: ubuntu-latest
25+
target-platform: linux
2526
clang-version: '20'
27+
- host: 'windows-latest'
28+
target-platform: win32
2629
with:
2730
host-platform: ${{ matrix.host }}
28-
target: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"
31+
target-platform: ${{ matrix.target-platform }}
32+
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"
2933
clang-version: ${{ matrix.clang-version || '' }}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Code Validation (Windows)
2+
run-name: Code Validation (Windows, ${{ github.ref_name }})
3+
4+
on:
5+
push:
6+
paths:
7+
- 'source/**'
8+
- '.github/workflows/build-dispatch.yaml'
9+
- '.github/workflows/build-validate-code.yaml'
10+
- '!source/data/**'
11+
workflow_dispatch:
12+
13+
jobs:
14+
validate:
15+
name: Validate (${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }})
16+
uses: ./.github/workflows/build-dispatch.yaml
17+
strategy:
18+
matrix:
19+
project: [all]
20+
pipeline: [x64]
21+
config: [Debug,Develop,Profile,Release]
22+
with:
23+
host-platform: 'windows-latest'
24+
target-platform: 'win32'
25+
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"

0 commit comments

Comments
 (0)