Skip to content

Commit 9e7de2c

Browse files
committed
Update build.yml
1 parent 18fb15e commit 9e7de2c

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

.github/workflows/build.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
- name: Get matrix from file
2020
id: matrix_setup
2121
uses: ManiVaultStudio/github-actions/matrix_setup@main
22-
with:
23-
matrix_ids : 'windows_2022 linux_gcc13 macos_code14'
2422

2523
cross-platform-build:
2624
name: Cross platform build
@@ -36,18 +34,9 @@ jobs:
3634

3735
steps:
3836
- name: Checkout the source
39-
if: github.event_name != 'pull_request'
4037
uses: actions/checkout@v4
4138
with:
4239
submodules: recursive
43-
fetch-depth: 0
44-
45-
- name: Checkout the source - pull request
46-
if: github.event_name == 'pull_request'
47-
uses: actions/checkout@v4
48-
with:
49-
submodules: recursive
50-
fetch-depth: 0
5140
ref: ${{ github.event.pull_request.head.ref }}
5241

5342
- name: Select Xcode for Mac only
@@ -83,8 +72,8 @@ jobs:
8372
conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
8473
rs_ssh_key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }}
8574

86-
- name: Linux Mac build
87-
if: "!startsWith(runner.os, 'Windows')"
75+
- name: Linux build
76+
if: startsWith(matrix.os, 'ubuntu')
8877
uses: ManiVaultStudio/github-actions/conan_linuxmac_build@main
8978
with:
9079
conan-compiler: ${{matrix.build-compiler}}
@@ -96,3 +85,19 @@ jobs:
9685
conan-user: ${{secrets.LKEB_UPLOAD_USER}}
9786
conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}}
9887
conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
88+
conan-cc: gcc-${{matrix.build-cversion}}
89+
conan-cxx: g++-${{matrix.build-cversion}}
90+
91+
- name: Mac build
92+
if: startsWith(matrix.os, 'macos')
93+
uses: ManiVaultStudio/github-actions/conan_linuxmac_build@main
94+
with:
95+
conan-compiler: ${{matrix.build-compiler}}
96+
conan-compiler-version: ${{matrix.build-cversion}}
97+
conan-libcxx-version: ${{matrix.build-libcxx}}
98+
conan-build-type: ${{matrix.build-config}}
99+
conan-build-os: ${{matrix.build-os}}
100+
build-arch: ${{matrix.build-arch}}
101+
conan-user: ${{secrets.LKEB_UPLOAD_USER}}
102+
conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}}
103+
conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}

0 commit comments

Comments
 (0)