Skip to content

Commit

Permalink
Update to Qt 6.3.2 and Install Qt Action 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sithlord48 committed Sep 11, 2022
1 parent 057080c commit 56c2db6
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
pull_request:
branches: [ master ]
env:
QtVersion: 6.3.1
QtKey: "6.3.1"
QtVersion: 6.3.2
QtKey: "6.3.2"
PackageGLOB: "Black_Chocobo-*.*"
BuildType: Release
cmakeConfigure: "cmake -S. -Bbuild -DQT_DEFAULT_MAJOR_VERSION=6 -DCMAKE_BUILD_TYPE=Release"
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- {
name: "Linux-amd64"
, os: ubuntu-20.04
, QT_INST_DIR: /opt, QTDIR: /opt/Qt/6.3.1/gcc_64
, QT_INST_DIR: /opt, QTDIR: /opt/Qt/6.3.2/gcc_64
, ff7tkPrefix: /opt/ff7tk
, ff7tkPackage: ff7tk-continuous-linux_X86_64.tar.gz
, install_ff7tk: "sudo tar -xf ff7tk-continuous-linux_x86_64.tar.gz --one-top-level=/opt/ff7tk"
Expand All @@ -85,7 +85,7 @@ jobs:
- {
name: "MacOS"
, os: macos-11
, QT_INST_DIR: /Users/runner, QTDIR: /Users/runner/Qt/6.3.1/clang_64
, QT_INST_DIR: /Users/runner, QTDIR: /Users/runner/Qt/6.3.2/clang_64
, ff7tkPrefix: /Users/runner/ff7tk
, ff7tkPackage: ff7tk-continuous-macos.zip
, install_ff7tk: "sudo unzip ff7tk-continuous-macos.zip -d /Users/runner/ff7tk"
Expand All @@ -94,7 +94,7 @@ jobs:
- {
name: "Windows-x64", WIN_ARCH: "x64"
, os: windows-2019
, QT_INST_DIR: "C:/", QTDIR: "C:/Qt/6.3.1/msvc2019_64"
, QT_INST_DIR: "C:/", QTDIR: "C:/Qt/6.3.2/msvc2019_64"
, ff7tkPrefix: "C:/ff7tk"
, ff7tkPackage: ff7tk-continuous-win64.7z
, install_ff7tk: "7z x ff7tk-continuous-win64.7z -oC:/ff7tk"
Expand All @@ -111,28 +111,19 @@ jobs:
fetch-depth: 0
- run: git fetch --tags --force

- name: Cache Qt
id: cache-qt
uses: actions/cache@v2
with:
path: ${{matrix.config.QT_INST_DIR}}/Qt
key: ${{ runner.os }}${{ matrix.config.WIN_ARCH }}-qt-${{ env.QtVersion }}

- name: Env Script (Windows)
uses: ilammy/msvc-dev-cmd@v1
if: runner.os == 'Windows'
with:
arch: ${{matrix.config.WIN_ARCH}}

- name: Install Qt
uses: jurplel/install-qt-action@v2.14.0
uses: jurplel/install-qt-action@v3
with:
aqtversion: ==2.0.0
py7zrversion: ==0.16.2
dir: ${{matrix.config.QT_INST_DIR}}
version: ${{ env.QtVersion }}
modules: qt5compat
cached: ${{ steps.cache-qt.outputs.cache-hit }}
cache: true

- name: Get ff7tk redist
run: curl -LJO /~https://github.com/sithlord48/ff7tk/releases/download/continuous/${{matrix.config.ff7tkPackage}}
Expand Down

0 comments on commit 56c2db6

Please sign in to comment.