Skip to content

Commit 7422c73

Browse files
committed
ci: fix
1 parent df46f5c commit 7422c73

2 files changed

Lines changed: 20 additions & 14 deletions

File tree

.github/workflows/abi_compliance_check.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,17 @@ jobs:
6262
version: ${{ matrix.qt }}
6363
aqtversion: '==3.1.*'
6464

65+
- name: Select base sha
66+
id: base_sha
67+
run: |
68+
if: github.event_name == 'pull_request'
69+
echo "SHA='-Daide_ABI_BASE_HASH=${{ github.event.pull_request.base.sha }}'" >> $GITHUB_ENV
70+
else
71+
echo "SHA=''" > $GITHUB_ENV
72+
6573
# Shared Debug with ABI compliance check
6674
- name: "ABI Compliance Check: Workflow"
67-
run: cmake --workflow --preset workflow-ci-abi-check-unix-shared-debug
75+
run: cmake --workflow --preset workflow-ci-abi-check-unix-shared-debug ${{ steps.base_sha.outputs.SHA }}
6876
env:
6977
QT_QPA_PLATFORM: offscreen
7078

CMakePresets.json

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,17 @@
119119
"CMAKE_CXX_COMPILER": "g++"
120120
}
121121
},
122+
{ "name": "abi-check", "hidden": true,
123+
"cacheVariables": { "aide_ENABLE_ABI_COMPLIANCE_CHECK": "ON" }
124+
},
122125

126+
{ "name": "codeql", "hidden": true,
127+
"cacheVariables": { "aide_ENABLE_COVERAGE": "ON" }
128+
},
129+
130+
{ "name": "doxygen", "hidden": true,
131+
"cacheVariables": { "ENABLE_DOXYGEN": "ON" }
132+
},
123133
{ "name": "test-on-ci", "hidden": true,
124134
"cacheVariables": { "UNIT_TESTS_RUN_ON_CI": "ON" }
125135
},
@@ -160,18 +170,6 @@
160170
{ "name": "ci-static-unix-shared-debug", "inherits": ["clang","shared","debug","role-ci-static", "platform-unix"] },
161171
{ "name": "ci-static-unix-shared-release", "inherits": ["clang","shared","release","role-ci-static", "platform-unix"] },
162172

163-
{ "name": "abi-check", "hidden": true,
164-
"cacheVariables": { "aide_ENABLE_ABI_COMPLIANCE_CHECK": "ON" }
165-
},
166-
167-
{ "name": "codeql", "hidden": true,
168-
"cacheVariables": { "aide_ENABLE_COVERAGE": "ON" }
169-
},
170-
171-
{ "name": "doxygen", "hidden": true,
172-
"cacheVariables": { "ENABLE_DOXYGEN": "ON" }
173-
},
174-
175173
{ "name": "ci-abi-check-unix-shared-debug", "inherits": ["clang","shared","debug","abi-check", "platform-unix"], "cacheVariables": { "CMAKE_DEBUG_POSTFIX": "_d" } },
176174

177175
{ "name": "ci-codeql-unix-debug", "inherits": ["clang","static","debug","codeql", "platform-unix"] },
@@ -218,7 +216,7 @@
218216
{ "name": "build-ci-static-unix-shared-debug", "configurePreset": "ci-static-unix-shared-debug", "jobs": 0 },
219217
{ "name": "build-ci-static-unix-shared-release", "configurePreset": "ci-static-unix-shared-release", "jobs": 0 },
220218

221-
{ "name": "build-ci-abi-check-unix-shared-debug", "configurePreset": "ci-abi-check-unix-shared-debug", "jobs": 0 },
219+
{ "name": "build-ci-abi-check-unix-shared-debug", "configurePreset": "ci-abi-check-unix-shared-debug", "jobs": 0, "targets": ["generate_abi_compliance_report"] },
222220

223221
{ "name": "build-ci-codeql-unix-debug", "configurePreset": "ci-codeql-unix-debug", "jobs": 0 },
224222

0 commit comments

Comments
 (0)