Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preliminary Qt 6.5 support #26

Merged
merged 1 commit into from
Sep 30, 2023
Merged

Preliminary Qt 6.5 support #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Android-Qt5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:

- name: Create artifacts
run: |
pushd install/home/runner/work/qt-geoservices-maplibre-gl
pushd install/home/runner/work/maplibre-native-qt
tar cjvf ../../../../../qt-geoservices-maplibre-gl_Android.tar.bz2 Qt
popd

Expand Down
100 changes: 45 additions & 55 deletions .github/workflows/Android-Qt6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,53 @@ name: Android Qt6 CI

on:
workflow_dispatch:
push:
branches:
- main
tags:
- '**'
paths-ignore:
- ".gitignore"
- "README.md"
# ignore CI for other platforms
- ".github/FUNDING.yml"
- ".github/actions/**"
- ".github/workflows/Android-Qt5.yml"
- ".github/workflows/iOS-Qt5.yml"
- ".github/workflows/iOS-Qt6.yml"
- ".github/workflows/Linux-Qt5.yml"
- ".github/workflows/Linux-Qt6.yml"
- ".github/workflows/macOS-Qt5.yml"
- ".github/workflows/macOS-Qt6.yml"
- ".github/workflows/Windows-Qt5.yml"
- ".github/workflows/Windows-Qt6.yml"

pull_request:
branches:
- main
paths-ignore:
- ".gitignore"
- "README.md"
# ignore CI for other platforms
- ".github/FUNDING.yml"
- ".github/actions/**"
- ".github/workflows/Android-Qt5.yml"
- ".github/workflows/iOS-Qt5.yml"
- ".github/workflows/iOS-Qt6.yml"
- ".github/workflows/Linux-Qt5.yml"
- ".github/workflows/Linux-Qt6.yml"
- ".github/workflows/macOS-Qt5.yml"
- ".github/workflows/macOS-Qt6.yml"
- ".github/workflows/Windows-Qt5.yml"
- ".github/workflows/Windows-Qt6.yml"
# push:
# branches:
# - main
# tags:
# - '**'
# paths-ignore:
# - ".gitignore"
# - "README.md"
# # ignore CI for other platforms
# - ".github/FUNDING.yml"
# - ".github/actions/**"
# - ".github/workflows/Android-Qt5.yml"
# - ".github/workflows/iOS-Qt5.yml"
# - ".github/workflows/iOS-Qt6.yml"
# - ".github/workflows/Linux-Qt5.yml"
# - ".github/workflows/Linux-Qt6.yml"
# - ".github/workflows/macOS-Qt5.yml"
# - ".github/workflows/macOS-Qt6.yml"
# - ".github/workflows/Windows-Qt5.yml"
# - ".github/workflows/Windows-Qt6.yml"

# pull_request:
# branches:
# - main
# paths-ignore:
# - ".gitignore"
# - "README.md"
# # ignore CI for other platforms
# - ".github/FUNDING.yml"
# - ".github/actions/**"
# - ".github/workflows/Android-Qt5.yml"
# - ".github/workflows/iOS-Qt5.yml"
# - ".github/workflows/iOS-Qt6.yml"
# - ".github/workflows/Linux-Qt5.yml"
# - ".github/workflows/Linux-Qt6.yml"
# - ".github/workflows/macOS-Qt5.yml"
# - ".github/workflows/macOS-Qt6.yml"
# - ".github/workflows/Windows-Qt5.yml"
# - ".github/workflows/Windows-Qt6.yml"

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
QT_VERSION: 6.4.3
QT_LOCATION_VERSION: 6.4.3.0
QT_VERSION: 6.5.0

jobs:
build-plugin:
Expand Down Expand Up @@ -81,7 +80,7 @@ jobs:
with:
aqtversion: ==3.0.*
version: ${{ env.QT_VERSION }}
modules: qtpositioning qtshadertools
modules: qtlocation qtpositioning qtshadertools
set-env: false

- name: Download Qt (Android)
Expand All @@ -92,21 +91,14 @@ jobs:
version: ${{ env.QT_VERSION }}
target: android
arch: ${{ matrix.config.arch }}
modules: qtpositioning qtshadertools
modules: qtlocation qtpositioning qtshadertools

- name: Fix Qt release
if: ${{ matrix.config.abi }} == 'armeabi-v7a'
run: |
run: |
chmod +x "$Qt6_DIR/bin/qt-cmake"
sed -i "s/C:\/Qt\/Qt-${QT_VERSION}/\/usr\/local\/Qt-${QT_VERSION}/g" "$Qt6_DIR/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake"

- name: Download QtLocation
run: |
wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
tar xvf QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2 -C ..
wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2
tar xvf QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2 -C ..

- name: Set up OpenJDK 11
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -154,13 +146,13 @@ jobs:
with:
name: qt-geoservices-maplibre-gl_Android_x86
path: install-x86

- name: Download artifacts for x86_64
uses: actions/download-artifact@v3
with:
name: qt-geoservices-maplibre-gl_Android_x86_64
path: install-x86_64

- name: Download artifacts for armeabi-v7a
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -210,8 +202,6 @@ jobs:
env:
TAG_NAME: ${{ github.ref_name }}
run: |
wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2
tar xvf QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2
tar xvf qt-geoservices-maplibre-gl_Android.tar.bz2
tar cjvf qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2 Qt

Expand Down
86 changes: 39 additions & 47 deletions .github/workflows/Linux-Qt6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,51 @@ name: Linux Qt6 CI

on:
workflow_dispatch:
push:
branches:
- main
tags:
- '**'
paths-ignore:
- ".gitignore"
- "README.md"
# ignore CI for other platforms
- ".github/FUNDING.yml"
- ".github/workflows/Android-Qt5.yml"
- ".github/workflows/Android-Qt6.yml"
- ".github/workflows/iOS-Qt5.yml"
- ".github/workflows/iOS-Qt6.yml"
- ".github/workflows/Linux-Qt5.yml"
- ".github/workflows/macOS-Qt5.yml"
- ".github/workflows/macOS-Qt6.yml"
- ".github/workflows/Windows-Qt5.yml"
- ".github/workflows/Windows-Qt6.yml"

pull_request:
branches:
- main
paths-ignore:
- ".gitignore"
- "README.md"
# ignore CI for other platforms
- ".github/FUNDING.yml"
- ".github/workflows/Android-Qt5.yml"
- ".github/workflows/Android-Qt6.yml"
- ".github/workflows/iOS-Qt5.yml"
- ".github/workflows/iOS-Qt6.yml"
- ".github/workflows/Linux-Qt5.yml"
- ".github/workflows/macOS-Qt5.yml"
- ".github/workflows/macOS-Qt6.yml"
- ".github/workflows/Windows-Qt5.yml"
- ".github/workflows/Windows-Qt6.yml"
# push:
# branches:
# - main
# tags:
# - '**'
# paths-ignore:
# - ".gitignore"
# - "README.md"
# # ignore CI for other platforms
# - ".github/FUNDING.yml"
# - ".github/workflows/Android-Qt5.yml"
# - ".github/workflows/Android-Qt6.yml"
# - ".github/workflows/iOS-Qt5.yml"
# - ".github/workflows/iOS-Qt6.yml"
# - ".github/workflows/Linux-Qt5.yml"
# - ".github/workflows/macOS-Qt5.yml"
# - ".github/workflows/macOS-Qt6.yml"
# - ".github/workflows/Windows-Qt5.yml"
# - ".github/workflows/Windows-Qt6.yml"

# pull_request:
# branches:
# - main
# paths-ignore:
# - ".gitignore"
# - "README.md"
# # ignore CI for other platforms
# - ".github/FUNDING.yml"
# - ".github/workflows/Android-Qt5.yml"
# - ".github/workflows/Android-Qt6.yml"
# - ".github/workflows/iOS-Qt5.yml"
# - ".github/workflows/iOS-Qt6.yml"
# - ".github/workflows/Linux-Qt5.yml"
# - ".github/workflows/macOS-Qt5.yml"
# - ".github/workflows/macOS-Qt6.yml"
# - ".github/workflows/Windows-Qt5.yml"
# - ".github/workflows/Windows-Qt6.yml"

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
QT_VERSION: 6.4.3
QT_LOCATION_VERSION: 6.4.3.0
QT_VERSION: 6.5.0

jobs:
build-plugin:
Expand All @@ -69,12 +68,7 @@ jobs:
version: ${{ env.QT_VERSION }}
dir: ${{ github.workspace }}
target: desktop
modules: qtpositioning qtshadertools

- name: Download QtLocation
run: |
wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
tar xvf QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
modules: qtlocation qtpositioning qtshadertools

- name: Set up ccache
uses: hendrikmuhs/ccache-action@v1
Expand Down Expand Up @@ -115,8 +109,6 @@ jobs:
env:
TAG_NAME: ${{ github.ref_name }}
run: |
wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
tar xvf QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
tar xvf qt-geoservices-maplibre-gl_Linux.tar.bz2
tar cjvf qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2 Qt

Expand Down
80 changes: 40 additions & 40 deletions .github/workflows/Windows-Qt5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,45 @@ name: Windows Qt5 CI

on:
workflow_dispatch:
push:
branches:
- main
tags:
- '**'
paths-ignore:
- ".gitignore"
- "README.md"
# ignore CI for other platforms
- ".github/FUNDING.yml"
- ".github/actions/**"
- ".github/workflows/Android-Qt5.yml"
- ".github/workflows/Android-Qt6.yml"
- ".github/workflows/iOS-Qt5.yml"
- ".github/workflows/iOS-Qt6.yml"
- ".github/workflows/Linux-Qt5.yml"
- ".github/workflows/Linux-Qt6.yml"
- ".github/workflows/macOS-Qt5.yml"
- ".github/workflows/macOS-Qt6.yml"
- ".github/workflows/Windows-Qt6.yml"

pull_request:
branches:
- main
paths-ignore:
- ".gitignore"
- "README.md"
# ignore CI for other platforms
- ".github/FUNDING.yml"
- ".github/actions/**"
- ".github/workflows/Android-Qt5.yml"
- ".github/workflows/Android-Qt6.yml"
- ".github/workflows/iOS-Qt5.yml"
- ".github/workflows/iOS-Qt6.yml"
- ".github/workflows/Linux-Qt5.yml"
- ".github/workflows/Linux-Qt6.yml"
- ".github/workflows/macOS-Qt5.yml"
- ".github/workflows/macOS-Qt6.yml"
- ".github/workflows/Windows-Qt6.yml"
# push:
# branches:
# - main
# tags:
# - '**'
# paths-ignore:
# - ".gitignore"
# - "README.md"
# # ignore CI for other platforms
# - ".github/FUNDING.yml"
# - ".github/actions/**"
# - ".github/workflows/Android-Qt5.yml"
# - ".github/workflows/Android-Qt6.yml"
# - ".github/workflows/iOS-Qt5.yml"
# - ".github/workflows/iOS-Qt6.yml"
# - ".github/workflows/Linux-Qt5.yml"
# - ".github/workflows/Linux-Qt6.yml"
# - ".github/workflows/macOS-Qt5.yml"
# - ".github/workflows/macOS-Qt6.yml"
# - ".github/workflows/Windows-Qt6.yml"

# pull_request:
# branches:
# - main
# paths-ignore:
# - ".gitignore"
# - "README.md"
# # ignore CI for other platforms
# - ".github/FUNDING.yml"
# - ".github/actions/**"
# - ".github/workflows/Android-Qt5.yml"
# - ".github/workflows/Android-Qt6.yml"
# - ".github/workflows/iOS-Qt5.yml"
# - ".github/workflows/iOS-Qt6.yml"
# - ".github/workflows/Linux-Qt5.yml"
# - ".github/workflows/Linux-Qt6.yml"
# - ".github/workflows/macOS-Qt5.yml"
# - ".github/workflows/macOS-Qt6.yml"
# - ".github/workflows/Windows-Qt6.yml"

concurrency:
# cancel jobs on PRs only
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
env:
TAG_ARCH: ${{ matrix.config.qtarch }}
run: |
pushd install/a/qt-geoservices-maplibre-gl
pushd install/a/maplibre-native-qt
tar cjvf ../../../qt-geoservices-maplibre-gl_Windows_${TAG_ARCH}.tar.bz2 Qt
popd

Expand Down
Loading
Loading