168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Update current version from 6.3 to 6.4 

Resolves #239
This commit is contained in:
Peter Hartmann 2022-12-21 17:05:28 +01:00 committed by uwerat
parent 998153f6ec
commit 6c1c04c7be
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.github/workflows/qmake.yml vendored
View File

@ -127,28 +127,28 @@ jobs:
build-linux-qt-current: build-linux-qt-current:
name: Linux Qt 6.3 (current) build name: Linux Qt 6.4 (current) build
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
DISPLAY: ":1" DISPLAY: ":1"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache Qt - name: Cache Qt
id: cache-qt-6-3 id: cache-qt-6-4
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
with: with:
path: ../Qt/6.3.0 path: ../Qt/6.4.1
key: ${{ runner.os }}-QtCache-Qt6-3 key: ${{ runner.os }}-QtCache-Qt6-4
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '6.3.0' version: '6.4.1'
host: 'linux' host: 'linux'
target: 'desktop' target: 'desktop'
install-deps: 'true' install-deps: 'true'
modules: 'qtwebengine' modules: 'qtwebengine'
cached: ${{ steps.cache-qt-6-3.outputs.cache-hit }} cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
setup-python: 'true' setup-python: 'true'
tools: '' tools: ''
set-env: 'true' set-env: 'true'
@ -174,7 +174,7 @@ jobs:
./examples/bin/gallery & ./examples/bin/gallery &
sleep 10 sleep 10
echo taking screenshot echo taking screenshot
import -pause 1 -window root screenshot-linux-qt6-3.jpg import -pause 1 -window root screenshot-linux-qt6-4.jpg
echo killing gallery echo killing gallery
killall gallery killall gallery
echo killing Xvfb echo killing Xvfb
@ -182,8 +182,8 @@ jobs:
- name: Upload smoke test artifacts - name: Upload smoke test artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: screenshot-linux-qt6-3.jpg name: screenshot-linux-qt6-4.jpg
path: screenshot-linux-qt6-3.jpg path: screenshot-linux-qt6-4.jpg
build-windows-qt5-15: build-windows-qt5-15:
@ -297,27 +297,27 @@ jobs:
build-windows-qt-current: build-windows-qt-current:
name: Windows Qt 6.3 (current) build name: Windows Qt 6.4 (current) build
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache Qt - name: Cache Qt
id: cache-qt-6-3 id: cache-qt-6-4
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
with: with:
path: ../Qt/6.3.0 path: ../Qt/6.4.1
key: ${{ runner.os }}-QtCache-Qt6-3 key: ${{ runner.os }}-QtCache-Qt6-4
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '6.3.0' version: '6.4.1'
host: 'windows' host: 'windows'
target: 'desktop' target: 'desktop'
arch: 'win64_msvc2019_64' arch: 'win64_msvc2019_64'
install-deps: 'true' install-deps: 'true'
modules: 'qtwebengine' modules: 'qtwebengine'
cached: ${{ steps.cache-qt-6-3.outputs.cache-hit }} cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
setup-python: 'true' setup-python: 'true'
tools: '' tools: ''
set-env: 'true' set-env: 'true'
@ -346,7 +346,7 @@ jobs:
Start-Sleep -s 10 Start-Sleep -s 10
- uses: OrbitalOwen/desktop-screenshot-action@0.1 - uses: OrbitalOwen/desktop-screenshot-action@0.1
with: with:
file-name: 'screenshot-windows-qt6-3.jpg' file-name: 'screenshot-windows-qt6-4.jpg'
- name: Cleanup smoke test - name: Cleanup smoke test
run: taskkill /IM gallery.exe /T run: taskkill /IM gallery.exe /T
@ -443,26 +443,26 @@ jobs:
run: killall gallery run: killall gallery
build-mac-qt-current: build-mac-qt-current:
name: MacOS Qt 6.3 (current) build name: MacOS Qt 6.4 (current) build
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache Qt - name: Cache Qt
id: cache-qt-6-3 id: cache-qt-6-4
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
with: with:
path: ../Qt/6.3.0 path: ../Qt/6.4.1
key: ${{ runner.os }}-QtCache-Qt6-3 key: ${{ runner.os }}-QtCache-Qt6-4
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '6.3.0' version: '6.4.1'
host: 'mac' host: 'mac'
target: 'desktop' target: 'desktop'
install-deps: 'true' install-deps: 'true'
modules: 'qtwebengine' modules: 'qtwebengine'
cached: ${{ steps.cache-qt-6-3.outputs.cache-hit }} cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
setup-python: 'true' setup-python: 'true'
tools: '' tools: ''
set-env: 'true' set-env: 'true'
@ -483,6 +483,6 @@ jobs:
sleep 10 sleep 10
- uses: OrbitalOwen/desktop-screenshot-action@0.1 - uses: OrbitalOwen/desktop-screenshot-action@0.1
with: with:
file-name: 'screenshot-macos-qt6-3.jpg' file-name: 'screenshot-macos-qt6-4.jpg'
- name: Cleanup smoke test - name: Cleanup smoke test
run: killall gallery run: killall gallery