diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d129450..5ce0ac1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,11 +32,11 @@ jobs: - name: "macOS Monterey 12 avx" os: macos-12 arch: "core-avx-i" - - name: "macOS Big Sur 11.0 avx" - os: macos-11.0 + - name: "macOS Ventura 13 avx" + os: macos-13 arch: "core-avx-i" - - name: "macOS Big Sur 11.0 x86-64" - os: macos-11.0 + - name: "macOS Ventura 13 x86-64" + os: macos-13 arch: "x86-64" - name: "macOS Monterey 12 avx" os: macos-12 @@ -217,7 +217,7 @@ jobs: # https://software.intel.com/content/www/us/en/develop/articles/installing-intel-free-libs-and-python-apt-repo.html - name: Install MKL run: | - wget -qO- "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB" | sudo apt-key add - + wget -qO- "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" | sudo apt-key add - sudo sh -c "echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list" sudo apt-get update -o Dir::Etc::sourcelist="/etc/apt/sources.list.d/intel-mkl.list" sudo apt-get install -y --no-install-recommends intel-mkl-64bit-2020.0-088 diff --git a/3rd_party/bergamot-translator b/3rd_party/bergamot-translator index 321be8a..9271618 160000 --- a/3rd_party/bergamot-translator +++ b/3rd_party/bergamot-translator @@ -1 +1 @@ -Subproject commit 321be8ae0486de3af67307c4cb2e005994593597 +Subproject commit 9271618ebbdc5d21ac4dc4df9e72beb7ce644774 diff --git a/src/inventory/ModelManager.cpp b/src/inventory/ModelManager.cpp index f85c279..08c9e12 100644 --- a/src/inventory/ModelManager.cpp +++ b/src/inventory/ModelManager.cpp @@ -79,7 +79,7 @@ ModelManager::ModelManager(QObject *parent, Settings * settings) , settings_(settings) , isFetchingRemoteModels_(false) { - appDataDir_ = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); + appDataDir_.setPath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)); if (!QDir(appDataDir_).exists()) { if (QFileInfo::exists(appDataDir_.absolutePath())) { std::cerr << "We want to store data at a directory at: " << appDataDir_.absolutePath().toStdString() << " but a file with the same name exists." << std::endl;