diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 0f798289..19d6d75d 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -201,8 +201,7 @@ jobs: - target: Debug # tests only os: macos-latest xcode: 14.2 - qt_version: 6.5 - qt_modules: "qtmultimedia qtwebsockets" + qt_version: homebrew type: Debug do_tests: 1 @@ -215,23 +214,16 @@ jobs: do_tests: 1 make_package: 1 use_old_protobuf: 1 + qt_py7zrversion: '==0.20.*' - - target: 12_Monterey - os: macos-12 - xcode: 14.0.1 + - target: 13_Ventura + os: macos-13 + xcode: 14.3.1 qt_version: homebrew type: Release do_tests: 1 make_package: 1 - - target: 13_Ventura - os: macos-13 - xcode: 14.3 - qt_version: homebrew - type: Release - do_tests: 1 - make_package: 0 - name: macOS ${{matrix.target}} needs: configure runs-on: ${{matrix.os}} @@ -251,6 +243,7 @@ jobs: env: install_qt: ${{matrix.qt_version}} use_old_protobuf: ${{matrix.use_old_protobuf}} + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 run: | brew update if [[ $use_old_protobuf == 1 ]]; then @@ -274,6 +267,7 @@ jobs: setup-python: false version: ${{matrix.qt_version}} modules: ${{matrix.qt_modules}} + py7zrversion: ${{matrix.qt_py7zrversion}} - name: Build on Xcode ${{matrix.xcode}} shell: bash diff --git a/oracle/src/zip/zipglobal.cpp b/oracle/src/zip/zipglobal.cpp index d09a1b67..e972005f 100644 --- a/oracle/src/zip/zipglobal.cpp +++ b/oracle/src/zip/zipglobal.cpp @@ -27,7 +27,7 @@ #include "zipglobal.h" -#if defined(Q_OS_WIN) || defined(Q_OS_WINCE) || defined(Q_OS_LINUX) || defined(Q_OS_MACX) +#if defined(Q_OS_WIN) || defined(Q_OS_WINCE) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS) #define OSDAB_ZIP_HAS_UTC #include #else @@ -36,7 +36,7 @@ #if defined(Q_OS_WIN) #include -#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX) +#elif defined(Q_OS_LINUX) || defined(Q_OS_MACOS) #include #endif @@ -138,7 +138,7 @@ bool OSDAB_ZIP_MANGLE(setFileTimestamp)(const QString &fileName, const QDateTime CloseHandle(hFile); return success; -#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX) +#elif defined(Q_OS_LINUX) || defined(Q_OS_MACOS) struct utimbuf t_buffer; t_buffer.actime = t_buffer.modtime = dateTime.toSecsSinceEpoch();