Skip to content

Commit 09fa2cd

Browse files
committed
feat: Re-add support for Qt Creator 15.0.1
1 parent 91a6a88 commit 09fa2cd

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

.github/workflows/build_cmake.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ on:
1313
env:
1414
PLUGIN_NAME: QodeAssist
1515
QT_VERSION: 6.8.2
16-
QT_CREATOR_VERSION: 16.0.0
17-
QT_CREATOR_VERSION_INTERNAL: 16.0.0
1816
MACOS_DEPLOYMENT_TARGET: "11.0"
1917
CMAKE_VERSION: "3.29.6"
2018
NINJA_VERSION: "1.12.1"
@@ -47,6 +45,17 @@ jobs:
4745
platform: mac_x64,
4846
cc: "clang", cxx: "clang++"
4947
}
48+
qt_creator:
49+
- {
50+
version: "15.0.1",
51+
version_internal: "15.0.1",
52+
latest: false
53+
}
54+
- {
55+
version: "16.0.0",
56+
version_internal: "16.0.0",
57+
latest: true
58+
}
5059

5160
steps:
5261
- uses: actions/checkout@v4
@@ -176,7 +185,7 @@ jobs:
176185
- name: Download Qt Creator
177186
uses: qt-creator/install-dev-package@v1.2
178187
with:
179-
version: ${{ env.QT_CREATOR_VERSION }}
188+
version: ${{ matrix.qt_creator.version }}
180189
unzip-to: 'qtcreator'
181190

182191
- name: Extract Qt Creator
@@ -223,7 +232,7 @@ jobs:
223232
COMMAND python
224233
-u
225234
"${{ steps.qt_creator.outputs.qtc_dir }}/${build_plugin_py}"
226-
--name "$ENV{PLUGIN_NAME}-$ENV{QT_CREATOR_VERSION}-${{ matrix.config.artifact }}"
235+
--name "$ENV{PLUGIN_NAME}-${{ matrix.qt_creator.version }} -${{ matrix.config.artifact }}"
227236
--src .
228237
--build build
229238
--qt-path "${{ steps.qt.outputs.qt_dir }}"
@@ -241,12 +250,12 @@ jobs:
241250
- name: Upload
242251
uses: actions/upload-artifact@v4
243252
with:
244-
path: ./${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}.7z
245-
name: ${{ env.PLUGIN_NAME}}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}.7z
253+
path: ./${{ env.PLUGIN_NAME }}-${{ matrix.qt_creator.version }}-${{ matrix.config.artifact }}.7z
254+
name: ${{ env.PLUGIN_NAME}}-${{ matrix.qt_creator.version }}-${{ matrix.config.artifact }}.7z
246255

247256
# The json is the same for all platforms, but we need to save one
248257
- name: Upload plugin json
249-
if: startsWith(matrix.config.os, 'ubuntu')
258+
if: startsWith(matrix.config.os, 'ubuntu') && matrix.config.latest
250259
uses: actions/upload-artifact@v4
251260
with:
252261
name: ${{ env.PLUGIN_NAME }}-origin-json
@@ -286,7 +295,7 @@ jobs:
286295
QT_TOKEN: ${{ secrets.TOKEN }}
287296
API_URL: ${{ secrets.API_URL }}
288297
run: |
289-
node .github/scripts/registerPlugin.js ${{ env.RELEASE_HTML_URL }} ${{ env.PLUGIN_NAME }} ${{ env.QT_CREATOR_VERSION }} ${{ env.QT_CREATOR_VERSION_INTERNAL }} ${{ env.QT_TOKEN }} ${{ env.API_URL }}
298+
node .github/scripts/registerPlugin.js ${{ env.RELEASE_HTML_URL }} ${{ env.PLUGIN_NAME }} ${{ matrix.qt_creator.version }} ${{ matrix.qt_creator.version_internal }} ${{ env.QT_TOKEN }} ${{ env.API_URL }}
290299
291300
- name: Delete previous json artifacts
292301
uses: geekyeggo/delete-artifact@v5

0 commit comments

Comments
 (0)