Skip to content

Commit

Permalink
Also update versions used in CI, and remove reference in .gitmodules
Browse files Browse the repository at this point in the history
  • Loading branch information
zrax committed Oct 9, 2024
1 parent cb96256 commit d4edd29
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@ jobs:
generator: Visual Studio 16 2019
cmake-arch: Win32
triplet: x86-windows-static-md
kf5: v5.106.0
kf5: v5.116.0
qt: 5.15.2
kf5_cmake_args: ""
qt-arch: win32_msvc2019
- os: windows-2019
generator: Visual Studio 16 2019
cmake-arch: x64
triplet: x64-windows-static-md
kf5: v5.106.0
kf5: v5.116.0
kf5_cmake_args: ""
qt: 5.15.2
qt_arch: win64_msvc2019_64
- os: windows-2019
generator: Visual Studio 16 2019
cmake-arch: x64
triplet: x64-windows-static-md
kf5: v5.106.0
kf5: v6.6.0
kf5_cmake_args: "-DBUILD_WITH_QT6=ON"
qt: 6.5.1
qt: 6.5.3
qt_arch: win64_msvc2019_64

steps:
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
# Qt5 takes roughly a thousand years to build, so we download it from elsewhere...
- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
arch: ${{ matrix.cfg.qt-arch }}
version: ${{ matrix.cfg.qt }}
Expand Down Expand Up @@ -142,7 +142,6 @@ jobs:
path: syntax-highlighting
ref: ${{ matrix.cfg.kf5 }}

- uses: shogo82148/actions-setup-perl@v1
- name: Build KF5SyntaxHighlighting
run: |
cd syntax-highlighting
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "pycdc"]
path = pycdc
url = https://github.com/zrax/pycdc
[submodule "qtextpad"]
path = qtextpad
url = https://github.com/zrax/qtextpad

0 comments on commit d4edd29

Please sign in to comment.