From 72033e202331322a1ae42ac5aa868e177c62909b Mon Sep 17 00:00:00 2001 From: Zalenski Egor <63463140+zalenskiSofteq@users.noreply.github.com> Date: Tue, 22 Mar 2022 21:26:10 +0300 Subject: [PATCH 1/4] Updated config.yml --- .circleci/config.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31698c534d..423feff290 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -765,25 +765,32 @@ jobs: [key]='platform' [value]='macos' [objectDownload]=${applicationName}'-mac-x64.dmg' - [objectUpgrade]=${applicationName}'.zip' + [objectUpgrade]=${applicationName}'-mac-x64.zip' ) declare -A tag1=( + [key]='platform' + [value]='macos' + [objectDownload]=${applicationName}'-mac-arm64.dmg' + [objectUpgrade]=${applicationName}'-mac-arm64.zip' + ) + + declare -A tag2=( [key]='platform' [value]='windows' [objectDownload]=${applicationName}'-win-installer.exe' ) - declare -A tag2=( + declare -A tag3=( [key]='platform' [value]='linux_AppImage' - [objectDownload]=${applicationName}'-linux.AppImage' + [objectDownload]=${applicationName}'-x86_64.AppImage' ) - declare -A tag3=( + declare -A tag4=( [key]='platform' [value]='linux_deb' - [objectDownload]=${applicationName}'-linux.deb' + [objectDownload]=${applicationName}'-amd64.deb' ) # loop for add all tags to each app and create metrics @@ -998,7 +1005,12 @@ workflows: - Build app - Linux (prod) - virustotal: name: Virus check - dmg (prod) - ext: dmg + ext: x64.dmg + requires: + - Build app - MacOS (prod) + - virustotal: + name: Virus check - dmg (prod) + ext: arm64.dmg requires: - Build app - MacOS (prod) - virustotal: From 6864381a9c4cfe8d007ef6f4a84309ffca720861 Mon Sep 17 00:00:00 2001 From: Zalenski Egor <63463140+zalenskiSofteq@users.noreply.github.com> Date: Tue, 22 Mar 2022 21:39:36 +0300 Subject: [PATCH 2/4] Updated config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 423feff290..27f642712c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1007,12 +1007,12 @@ workflows: name: Virus check - dmg (prod) ext: x64.dmg requires: - - Build app - MacOS (prod) + - Build app arm64 - MacOS (prod) - virustotal: name: Virus check - dmg (prod) ext: arm64.dmg requires: - - Build app - MacOS (prod) + - Build app x64- MacOS (prod) - virustotal: name: Virus check - exe (prod) ext: exe From 9a0686c50481db1a3360a49a006dcdc89d9515ef Mon Sep 17 00:00:00 2001 From: Zalenski Egor <63463140+zalenskiSofteq@users.noreply.github.com> Date: Tue, 22 Mar 2022 21:42:13 +0300 Subject: [PATCH 3/4] Updated config.yml --- .circleci/config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27f642712c..f565d4673b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1012,7 +1012,7 @@ workflows: name: Virus check - dmg (prod) ext: arm64.dmg requires: - - Build app x64- MacOS (prod) + - Build app x64 - MacOS (prod) - virustotal: name: Virus check - exe (prod) ext: exe @@ -1025,7 +1025,8 @@ workflows: requires: - Virus check - AppImage (prod) - Virus check - deb (prod) - - Virus check - dmg (prod) + - Virus check x64 - dmg (prod) + - Virus check arm64 - dmg (prod) - Virus check - exe (prod) - release-github: @@ -1034,7 +1035,8 @@ workflows: requires: - Virus check - AppImage (prod) - Virus check - deb (prod) - - Virus check - dmg (prod) + - Virus check x64 - dmg (prod) + - Virus check arm64 - dmg (prod) - Virus check - exe (prod) # Manual approve for publish release From 8855f031db482c8580756d1b04dd3cbc5166074e Mon Sep 17 00:00:00 2001 From: Zalenski Egor <63463140+zalenskiSofteq@users.noreply.github.com> Date: Tue, 22 Mar 2022 21:43:17 +0300 Subject: [PATCH 4/4] Updated config.yml --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f565d4673b..21f3ca7f40 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1004,15 +1004,15 @@ workflows: requires: - Build app - Linux (prod) - virustotal: - name: Virus check - dmg (prod) + name: Virus check arm64 - dmg (prod) ext: x64.dmg requires: - - Build app arm64 - MacOS (prod) + - Build app - MacOS (prod) - virustotal: - name: Virus check - dmg (prod) + name: Virus check x64 - dmg (prod) ext: arm64.dmg requires: - - Build app x64 - MacOS (prod) + - Build app - MacOS (prod) - virustotal: name: Virus check - exe (prod) ext: exe