Skip to content

Commit

Permalink
Dependabot/GitHub actions maintenance (#31)
Browse files Browse the repository at this point in the history
* Bump jurplel/install-qt-action from 2 to 3

Bumps [jurplel/install-qt-action](https://github.com/jurplel/install-qt-action) from 2 to 3.
- [Release notes](https://github.com/jurplel/install-qt-action/releases)
- [Commits](jurplel/install-qt-action@v2...v3)

---
updated-dependencies:
- dependency-name: jurplel/install-qt-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update main.yml (#30)

Maintenance: add Qt6 build, faster Qt5 installation, update actions, etc.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
iakov and dependabot[bot] authored May 14, 2024
1 parent c149ce1 commit c32b986
Showing 1 changed file with 26 additions and 20 deletions.
46 changes: 26 additions & 20 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: GitHub CI

on:
push:
branches:
pull_request:
branches:
workflow_dispatch:
on: [ push, pull_request, workflow_dispatch]

jobs:
build:
Expand All @@ -16,21 +11,28 @@ jobs:
include:
- os: windows-latest
os-name: windows
qt-version: '5.12.10'
mingw-version: 7.3
qt-version: '5.12'
mingw-short-version: 73
qt5-extra-archives: 'qtwinextras opengl32sw i686'

- os: ubuntu-latest
os-name: linux
qt-version: '5.12.10'
qt-version: '5.12'
qt5-extra-archives: 'qtx11extras icu'

- os: macos-latest
- os: ubuntu-latest
os-name: linux
qt-version: '5.15'
qt5-extra-archives: 'qtx11extras icu'

- os: macos-12
os-name: mac
qt-version: '5.12.10'
qt-version: '5.12'
qt5-extra-archives: 'qtmacextras'

- os: ubuntu-latest
os-name: linux
qt-version: '6.2.0'
qt-version: '6.5'

defaults:
run:
Expand All @@ -42,22 +44,26 @@ jobs:
git config --global core.symlinks true
git config --global core.autocrlf input
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install Qt
uses: jurplel/install-qt-action@v2
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qt-version }}
host: ${{ matrix.os-name }}
arch: 'win32_mingw${{ matrix.mingw-short-version }}'
tools: 'tools_mingw,${{ matrix.mingw-version }}.0,qt.tools.win32_mingw${{ matrix.mingw-short-version }}0'

modules: ${{ startsWith(matrix.qt-version, '6') && 'qt5compat qtmultimedia qtimageformats' || '' }}
arch: ${{ matrix.mingw-short-version != '' && format('win32_mingw{0}', matrix.mingw-short-version) || '' }}
tools: ${{ matrix.mingw-short-version != '' && format('tools_mingw,qt.tools.win32_mingw{0}0', matrix.mingw-short-version) || '' }}
archives: ${{ startsWith(matrix.qt-version, '5') && format('qttools qtsvg qtbase qttranslations qtmultimedia qtimageformats {0}', matrix.qt5-extra-archives) || '' }}
add-tools-to-path: true
# cache: true

- name: Update PATH
run: |
set -xue
cygpath -w /usr/bin >> $GITHUB_PATH
cygpath -w "${IQTA_TOOLS}/mingw${{matrix.mingw-short-version}}0_32/bin" >> $GITHUB_PATH
cygpath -w "${Qt5_Dir}/bin" >> $GITHUB_PATH
cygpath -w "${Qt${{startsWith(matrix.qt-version, '6') && '6_DIR' || '5_Dir' }}}/bin" >> $GITHUB_PATH
if: ${{ matrix.os-name == 'windows' }}

- name: Check available tools
Expand All @@ -84,7 +90,7 @@ jobs:
fi
- name: QMake
run: 'qmake trikCheckApp.pro CONFIG+=release'
run: qmake trikCheckApp.pro CONFIG+=release

- name: QMake all
timeout-minutes: 1
Expand Down

0 comments on commit c32b986

Please sign in to comment.