From 27d5b5d7849979995e0a5e5ed26f5ea5a431160c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 15 Jul 2023 19:24:22 +0300 Subject: [PATCH] Optimizing cleaning algorithm. --- appveyor.yml | 6 +++--- scripts/deploy.py | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 77db28aa0..3712c3042 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -126,7 +126,7 @@ environment: BUILD_SYSTEM: "qbs" ARCH: x64 XCODE_VERSION: 12.3 - PLATFORM: "macOS10.13+" + PLATFORM: "macOS_10.13+" MACOS_DEPLOYMENT_TARGET: 10.13 MULTI_BUNDLE: true DEPLOY: true @@ -139,7 +139,7 @@ environment: BUILD_SYSTEM: "qbs" ARCH: x64 XCODE_VERSION: 12.3 - PLATFORM: "macOS10.13+" + PLATFORM: "macOS_10.13+" MACOS_DEPLOYMENT_TARGET: 10.13 MULTI_BUNDLE: false DEPLOY: true @@ -274,7 +274,7 @@ environment: BUILD_SYSTEM: "make" ARCH: x64 XCODE_VERSION: 12.3 - PLATFORM: "macOS10.13+" + PLATFORM: "macOS_10.13+" DEPLOY: false - job_name: Windows_Qt_5_6_(MSVC_x64) diff --git a/scripts/deploy.py b/scripts/deploy.py index 2b3b49b5c..1e94adff9 100644 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -132,12 +132,14 @@ def run_clean(refresh_token): "access token from the app console on the web.") clean_folders = ["/0.7.x/Mac OS X", "/0.7.x/Windows"] - arhive_types = [r'^valentina-Windows.*\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$', - r'^valentina-Windows.*\+-mingw-x64-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$', - r'^valentina-Windows.*\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$', - r'^valentina-macOS.*\+-Qt.*-x64-develop-[a-f0-9]{40}\.tar\.xz$', + arhive_types = [r'^valentina-Windows10\+-mingw-x64-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$', + r'^valentina-Windows7\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$', + r'^valentina-WindowsXP\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$', + r'^valentina-macOS_11\+-Qt.*-x64-develop-[a-f0-9]{40}\.tar\.xz$', + r'^valentina-macOS_11\+-Qt.*-x64-develop-multibundle-[a-f0-9]{40}$', + r'^valentina-macOS_10.13\+-Qt.*-x64-develop-[a-f0-9]{40}\.tar\.xz$', + r'^valentina-macOS_10.13\+-Qt.*-x64-develop-multibundle-[a-f0-9]{40}$', r'^valentina-macOS.*\+-Qt.*-arm.*-develop-[a-f0-9]{40}\.tar\.xz$', - r'^valentina-macOS.*\+-Qt.*-x64-develop-multibundle-[a-f0-9]{40}$', r'^valentina-macOS.*\+-Qt.*-arm.*-develop-multibundle-[a-f0-9]{40}$'] item_types = {}