Skip to content

Commit 8033969

Browse files
Merge pull request #1805 from xaoex/copilot/fix-cmake-build-failures
Fix QA CMake matrix failures, merge conflicts, and CI triggering on PR branch updates
2 parents 162f87f + ccf2c27 commit 8033969

3 files changed

Lines changed: 15 additions & 4 deletions

File tree

.*

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/q-c-cpp.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ name: C/C++ CI
22

33
on:
44
push:
5-
branches: [ "production" ]
5+
branches: [ "production", "copilot/**" ]
66
pull_request:
77
branches: [ "production" ]
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
build:
1114

.github/workflows/qa-cmake-multi-platform.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ name: CMake on multiple platforms +all +qa
44

55
on:
66
push:
7-
branches: [ "production" ]
7+
branches: [ "production", "copilot/**" ]
88
pull_request:
99
branches: [ "production" ]
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
build:
1316
runs-on: ${{ matrix.os }}
@@ -36,13 +39,20 @@ jobs:
3639
- os: ubuntu-latest
3740
c_compiler: clang
3841
cpp_compiler: clang++
42+
- os: macos-latest
43+
c_compiler: clang
44+
cpp_compiler: clang++
3945
exclude:
4046
- os: windows-latest
4147
c_compiler: gcc
4248
- os: windows-latest
4349
c_compiler: clang
4450
- os: ubuntu-latest
4551
c_compiler: cl
52+
- os: macos-latest
53+
c_compiler: gcc
54+
- os: macos-latest
55+
c_compiler: cl
4656

4757
steps:
4858
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)