From 5a8a0859d22dd7d1c18469f2c7b1673369083ccd Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 24 Oct 2024 12:57:44 +0800 Subject: [PATCH 1/8] use dev branch api --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49fa003f6..75083b98a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,13 +60,13 @@ endif () ##! We fetch our dependencies if (APPLE) FetchContent_Declare(kdf - URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Darwin-Release.zip) + URL https://sdk.devbuilds.komodo.earth/dev/mm2_b35a818-mac-x86-64.zip) elseif (UNIX AND NOT APPLE) FetchContent_Declare(kdf - URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Linux-Release.zip) + URL https://sdk.devbuilds.komodo.earth/dev/mm2_b35a818-linux-x86-64.zip) else () FetchContent_Declare(kdf - URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Win64.zip) + URL https://sdk.devbuilds.komodo.earth/dev/mm2_b35a818-win-x86-64.zip) endif () #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip) From 6f772cb7dfd9786147597ca5028c727a028bc094 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 24 Oct 2024 13:05:47 +0800 Subject: [PATCH 2/8] increment version --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/atomicdex-desktop-cd.yml | 2 +- .github/workflows/atomicdex-desktop-ci.yml | 2 +- CMakeLists.txt | 2 +- cmake/project.metadata.cmake | 2 +- src/core/atomicdex/version/version.hpp | 8 ++++---- vcpkg.json | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c83aeedff..2f0984199 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ Please describe what you expected to happen. **Operating Environment(s):** - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ] - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ] - - Komodo Wallet Desktop Version: [e.g. 0.8.0] + - Komodo Wallet Desktop Version: [e.g. 0.8.1] - Build branch: [e.g. master/dev] diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 18d8bc396..0066556a3 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -9,7 +9,7 @@ env: DEX_PROJECT_NAME: "komodo-wallet" DEX_DISPLAY_NAME: "Komodo Wallet" DEX_COMPANY: "KomodoPlatform" - DEX_VERSION: "0.8.0" + DEX_VERSION: "0.8.1" DEX_WEBSITE: "https://atomicdex.io/" jobs: diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 87af63785..61e7bc499 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -17,7 +17,7 @@ env: DEX_PROJECT_NAME: "komodo-wallet" DEX_DISPLAY_NAME: "Komodo Wallet" DEX_COMPANY: "KomodoPlatform" - DEX_VERSION: "0.8.0" + DEX_VERSION: "0.8.1" DEX_WEBSITE: "https://atomicdex.io/" VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache VCPKG_BINARY_SOURCES: clear;x-gha,readwrite diff --git a/CMakeLists.txt b/CMakeLists.txt index 75083b98a..2372d2063 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include(vcpkg_prerequisites) include(qt_prerequisites) include(cfg_hash) -project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.0) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.1) message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}") include(cmake_default_options) diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake index b799e8dbf..d4001dfd3 100644 --- a/cmake/project.metadata.cmake +++ b/cmake/project.metadata.cmake @@ -7,7 +7,7 @@ set(DEX_DISPLAY_NAME "Komodo Wallet") set(DEX_MAINTENANCE_TOOL_NAME "Komodo Wallet Maintenance Tool") set(DEX_COMPANY "KomodoPlatform") set(DEX_WEBSITE "https://atomicdex.io/") -set(DEX_VERSION "0.8.0") +set(DEX_VERSION "0.8.1") set(DEX_SUPPORT_PAGE "https://support.komodoplatform.com/support/home") set(DEX_DISCORD "https://komodoplatform.com/discord") set(DEX_TWITTER "https://twitter.com/AtomicDEX") diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp index 921a49078..11c2aac03 100644 --- a/src/core/atomicdex/version/version.hpp +++ b/src/core/atomicdex/version/version.hpp @@ -21,24 +21,24 @@ namespace atomic_dex constexpr const char* get_version() { - return "0.8.0-beta"; + return "0.8.1-beta"; } constexpr int get_num_version() noexcept { - return 80; + return 81; } constexpr const char* get_raw_version() { - return "0.8.0"; + return "0.8.1"; } constexpr const char* get_precedent_raw_version() { - return "0.7.2"; + return "0.8.0"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index d53535cd4..031888ed4 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "komodo-wallet-desktop", - "version-string": "0.8.0", + "version-string": "0.8.1", "dependencies": [ "entt", "boost-multiprecision", From 4af13412d09f2aceb7f25486967fc0893daf4065 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 24 Oct 2024 15:56:25 +0800 Subject: [PATCH 3/8] fix some build warnings --- src/core/atomicdex/models/qt.orderbook.model.cpp | 2 +- src/core/atomicdex/models/qt.portfolio.model.cpp | 2 ++ src/core/atomicdex/pages/qt.portfolio.page.cpp | 4 +++- src/core/atomicdex/pages/qt.portfolio.page.hpp | 2 +- src/core/atomicdex/pages/qt.settings.page.cpp | 2 +- src/core/atomicdex/pages/qt.trading.page.cpp | 2 +- src/core/atomicdex/services/price/global.provider.cpp | 8 ++++++++ 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/core/atomicdex/models/qt.orderbook.model.cpp b/src/core/atomicdex/models/qt.orderbook.model.cpp index 16b68c1b1..06b542a34 100644 --- a/src/core/atomicdex/models/qt.orderbook.model.cpp +++ b/src/core/atomicdex/models/qt.orderbook.model.cpp @@ -524,7 +524,7 @@ namespace atomic_dex void orderbook_model::refresh_orderbook_model_data(const t_orders_contents& orderbook, bool is_bestorders) { - // SPDLOG_DEBUG("[orderbook_model::refresh_orderbook_model_data], is_bestorders: {}", is_bestorders); + SPDLOG_DEBUG("[orderbook_model::refresh_orderbook_model_data], is_bestorders: {}", is_bestorders); auto refresh_functor = [this](const std::vector& contents) { for (auto&& order: contents) diff --git a/src/core/atomicdex/models/qt.portfolio.model.cpp b/src/core/atomicdex/models/qt.portfolio.model.cpp index f05d01f8f..850241aed 100644 --- a/src/core/atomicdex/models/qt.portfolio.model.cpp +++ b/src/core/atomicdex/models/qt.portfolio.model.cpp @@ -131,7 +131,9 @@ namespace atomic_dex QJsonObject status = nlohmann_json_object_to_qt_json_object(coin_info.activation_status); update_value(ActivationStatus, status, idx, *this); SPDLOG_DEBUG("updated activation status of: {}", ticker); + return true; } + return false; } } diff --git a/src/core/atomicdex/pages/qt.portfolio.page.cpp b/src/core/atomicdex/pages/qt.portfolio.page.cpp index d958da586..4e4a227d0 100644 --- a/src/core/atomicdex/pages/qt.portfolio.page.cpp +++ b/src/core/atomicdex/pages/qt.portfolio.page.cpp @@ -163,12 +163,14 @@ namespace atomic_dex void portfolio_page::set_chart_category(WalletChartsCategories category) { + SPDLOG_INFO("new m_current_chart_category: {}", m_current_chart_category); + SPDLOG_INFO("qint32(category): {}", qint32(category)); SPDLOG_INFO("new chart category: {}", QMetaEnum::fromType().valueToKey(category)); if (m_current_chart_category != category) { m_current_chart_category = category; QSettings& settings = entity_registry_.ctx(); - settings.setValue("WalletChartsCategory", qint32(m_current_chart_category)); + settings.setValue("WalletChartsCategory", qint32(category)); if (m_system_manager.get_system().is_kdf_running() && m_system_manager.has_system()) { m_system_manager.get_system().manual_refresh("set_chart_category"); diff --git a/src/core/atomicdex/pages/qt.portfolio.page.hpp b/src/core/atomicdex/pages/qt.portfolio.page.hpp index 7df303ed2..5a39a2ba1 100644 --- a/src/core/atomicdex/pages/qt.portfolio.page.hpp +++ b/src/core/atomicdex/pages/qt.portfolio.page.hpp @@ -51,7 +51,7 @@ namespace atomic_dex global_coins_cfg_model* m_global_cfg_mdl; QString m_current_balance_all{"0"}; QString m_main_current_balance_all{"0"}; - WalletChartsCategories m_current_chart_category; + WalletChartsCategories m_current_chart_category{WalletChartsCategories::OneMonth}; public: //! Constructor diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp index c28589032..251f2046d 100644 --- a/src/core/atomicdex/pages/qt.settings.page.cpp +++ b/src/core/atomicdex/pages/qt.settings.page.cpp @@ -315,7 +315,7 @@ namespace atomic_dex { SPDLOG_WARN("Cannot change currency to {} for reason: {}", current_currency.toStdString(), reason); // Try next in line - int8_t selected_idx = utils::get_index_str(m_config.possible_currencies, current_currency.toStdString()); + unsigned long selected_idx = utils::get_index_str(m_config.possible_currencies, current_currency.toStdString()); if (selected_idx < m_config.possible_currencies.size() - 1) { set_current_currency(QString::fromStdString(m_config.possible_currencies[selected_idx + 1])); diff --git a/src/core/atomicdex/pages/qt.trading.page.cpp b/src/core/atomicdex/pages/qt.trading.page.cpp index 9becdbea2..78bfa6cb1 100644 --- a/src/core/atomicdex/pages/qt.trading.page.cpp +++ b/src/core/atomicdex/pages/qt.trading.page.cpp @@ -810,7 +810,7 @@ namespace atomic_dex SPDLOG_WARN("KDF service not available, required to clear forms - skipping"); return; } - // SPDLOG_DEBUG("clearing forms : {}", from.toStdString()); + SPDLOG_DEBUG("clearing forms : {}", from.toStdString()); if (m_preferred_order.has_value() && m_current_trading_mode == TradingModeGadget::Simple && m_selected_order_status == SelectedOrderGadget::OrderNotExistingAnymore) diff --git a/src/core/atomicdex/services/price/global.provider.cpp b/src/core/atomicdex/services/price/global.provider.cpp index 8648436e0..772577cc0 100644 --- a/src/core/atomicdex/services/price/global.provider.cpp +++ b/src/core/atomicdex/services/price/global.provider.cpp @@ -99,6 +99,14 @@ namespace atomic_dex global_price_service::refresh_other_coins_rates( const std::string& quote_id, const std::string& ticker, bool with_update_providers, std::atomic_uint16_t nb_try) { + SPDLOG_DEBUG("refresh_other_coins_rates: {} - {} - {} - {}", quote_id, ticker, with_update_providers, nb_try); + if (nb_try > 3) + { + SPDLOG_ERROR("Failed to fetch rates for ticker after 3 tries: {}", ticker); + this->m_coin_rate_providers[ticker] = "0.00"; + return; + } + t_float_50 price = safe_float(get_rate_conversion("USD", ticker, true)); if (price <= 0) { From 7940fbaebb78284d51f757d9285aa63db8188c5e Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 24 Oct 2024 16:00:57 +0800 Subject: [PATCH 4/8] fix windows CI build error --- src/core/atomicdex/api/kdf/kdf.client.cpp | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/atomicdex/api/kdf/kdf.client.cpp b/src/core/atomicdex/api/kdf/kdf.client.cpp index 8fc267787..0d01945d3 100644 --- a/src/core/atomicdex/api/kdf/kdf.client.cpp +++ b/src/core/atomicdex/api/kdf/kdf.client.cpp @@ -205,20 +205,20 @@ namespace atomic_dex::kdf auto http_request = make_request(request); generate_client() .request(http_request, m_token_source.get_token()) - .template then([on_rpc_processed, request](const web::http::http_response& resp) - { - try - { - auto rpc = process_rpc_answer(resp); - rpc.request = request; - on_rpc_processed(rpc); - } - catch (const std::exception& ex) - { - // SPDLOG_DEBUG("process_rpc_answer rpc.result: {}", rpc.raw_result); - SPDLOG_ERROR(ex.what()); - } - }); + .then([on_rpc_processed, request](const web::http::http_response& resp) + { + try + { + auto rpc = process_rpc_answer(resp); + rpc.request = request; + on_rpc_processed(rpc); + } + catch (const std::exception& ex) + { + // SPDLOG_DEBUG("process_rpc_answer rpc.result: {}", rpc.raw_result); + SPDLOG_ERROR(ex.what()); + } + }); } void From d0441548aff5394c52783b9050bf4429f411aadd Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 24 Oct 2024 16:09:18 +0800 Subject: [PATCH 5/8] fix macos build errors --- .github/workflows/atomicdex-desktop-cd.yml | 4 ++++ ci_tools_atomic_dex/ci_scripts/osx_script.sh | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 0066556a3..92a2c5a1c 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -255,6 +255,8 @@ jobs: - name: Install deps (MacOS/Release) run: | + rm '/usr/local/bin/2to3-3.12' + rm '/usr/local/bin/idle3' brew update brew upgrade brew install autoconf \ @@ -319,6 +321,8 @@ jobs: - name: Install deps (MacOS/Debug) run: | + rm '/usr/local/bin/2to3-3.12' + rm '/usr/local/bin/idle3' brew update brew upgrade brew install autoconf \ diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 35c101b08..afd3cc31e 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -2,6 +2,8 @@ # Workaround for https://github.com/actions/setup-python/issues/577 +rm '/usr/local/bin/2to3-3.12' +rm '/usr/local/bin/idle3' brew update brew install autoconf \ automake \ From a3f5aa2e4ea644b9a56461876b29912892f5b89c Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 24 Oct 2024 18:06:56 +0800 Subject: [PATCH 6/8] handle llvm dep symlink fail --- .github/workflows/atomicdex-desktop-cd.yml | 2 -- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 92a2c5a1c..24778dc32 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -255,8 +255,6 @@ jobs: - name: Install deps (MacOS/Release) run: | - rm '/usr/local/bin/2to3-3.12' - rm '/usr/local/bin/idle3' brew update brew upgrade brew install autoconf \ diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index afd3cc31e..67e569b9f 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -2,8 +2,6 @@ # Workaround for https://github.com/actions/setup-python/issues/577 -rm '/usr/local/bin/2to3-3.12' -rm '/usr/local/bin/idle3' brew update brew install autoconf \ automake \ @@ -14,9 +12,12 @@ brew install autoconf \ gnu-sed \ coreutils \ libtool \ - llvm \ gnu-getopt +brew unlink python@3.12 +brew install llvm +brew link --overwrite python@3.12 + pip3 install yq export CC=clang export CXX=clang++ From 1f8e41d34a47245621d68e065d6d71463bff706c Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 25 Oct 2024 14:01:15 +0800 Subject: [PATCH 7/8] brew fermenting --- .github/workflows/atomicdex-desktop-cd.yml | 2 -- .github/workflows/atomicdex-desktop-ci.yml | 8 ++++---- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 24778dc32..0066556a3 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -319,8 +319,6 @@ jobs: - name: Install deps (MacOS/Debug) run: | - rm '/usr/local/bin/2to3-3.12' - rm '/usr/local/bin/idle3' brew update brew upgrade brew install autoconf \ diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 61e7bc499..0728505c9 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -204,7 +204,7 @@ jobs: - name: import code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository - uses: Apple-Actions/import-codesign-certs@v1 + uses: Apple-Actions/import-codesign-certs@v3 with: keychain: ${{ github.run_id }} keychain-password: ${{ github.run_id }} @@ -213,7 +213,7 @@ jobs: - name: import installer code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository - uses: apple-actions/import-codesign-certs@v1 + uses: apple-actions/import-codesign-certs@v3 with: keychain: ${{ github.run_id }} keychain-password: ${{ github.run_id }} @@ -232,7 +232,7 @@ jobs: echo $HOME/sdk ls $HOME/sdk export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" - export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}" + export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}" export APPLE_ID="${{ secrets.APPLE_ID }}" export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}" @@ -382,7 +382,7 @@ jobs: if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository run: | export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" - export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}" + export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}" export APPLE_ID="${{ secrets.APPLE_ID }}" export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}" diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 67e569b9f..4fa728be8 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -15,8 +15,10 @@ brew install autoconf \ gnu-getopt brew unlink python@3.12 +brew unlink python@3.13 brew install llvm brew link --overwrite python@3.12 +brew link --overwrite python@3.13 pip3 install yq export CC=clang From 99c7775b9749dd1268c09185055bb142f0969c97 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 25 Oct 2024 19:50:33 +0800 Subject: [PATCH 8/8] update ci upload action --- .github/workflows/atomicdex-desktop-cd.yml | 12 ++++++------ .github/workflows/atomicdex-desktop-ci.yml | 14 +++++++------- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 2 -- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 0066556a3..679363b76 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -120,7 +120,7 @@ jobs: zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer - name: Upload artifacts (Linux) - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: AtomicDEX-Pro-Installer-linux-release path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip @@ -232,7 +232,7 @@ jobs: zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer - name: Upload artifacts (Linux/Debug) - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: AtomicDEX-Pro-Installer-linux-debug path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip @@ -296,7 +296,7 @@ jobs: ls bundle-Release/atomicDEX-Pro.dmg - name: Upload artifacts (MacOS/Release) - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dexpro-mac-release.dmg path: ./ci_tools_atomic_dex/bundle-Release/atomicDEX-Pro.dmg @@ -360,7 +360,7 @@ jobs: ls bundle-Debug/atomicDEX-Pro.dmg - name: Upload artifacts (MacOS/Debug) - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dexpro-mac-debug.dmg path: ./ci_tools_atomic_dex/bundle-Debug/atomicDEX-Pro.dmg @@ -438,7 +438,7 @@ jobs: ls bundle-Release/bundle.zip - name: Upload artifacts (Win/Release) - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dexpro-win-release path: ./ci_tools_atomic_dex/bundle-Release/bundle.zip @@ -516,7 +516,7 @@ jobs: ls bundle-Debug/bundle.zip - name: Upload artifacts (Windows/Debug) - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dexpro-win-debug path: ./ci_tools_atomic_dex/bundle-Debug/bundle.zip diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 0728505c9..0c885eafd 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -288,7 +288,7 @@ jobs: - name: Upload bundle artifact (Linux ZSTD) if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_zstd }} path: ./bundled/linux/${{ env.target_name_zstd }} @@ -296,7 +296,7 @@ jobs: - name: Upload bundle artifact (Linux ZIP) if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_zip }} path: ./bundled/linux/${{ env.target_name_zip }} @@ -304,7 +304,7 @@ jobs: - name: Upload bundle artifact (Linux AppImage) if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_appimage }} path: ./bundled/linux/${{ env.target_name_appimage }} @@ -318,7 +318,7 @@ jobs: - name: Upload artifacts (MacOS dmg) if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_dmg }} path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}.dmg @@ -326,7 +326,7 @@ jobs: - name: Upload artifacts (MacOS installer) if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_installer }} path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z @@ -341,7 +341,7 @@ jobs: - name: Upload artifacts (Windows zip) if: runner.os == 'Windows' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_zip }} path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}.zip @@ -349,7 +349,7 @@ jobs: - name: Upload artifacts (Windows installer) if: runner.os == 'Windows' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name_installer }} path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 4fa728be8..67e569b9f 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -15,10 +15,8 @@ brew install autoconf \ gnu-getopt brew unlink python@3.12 -brew unlink python@3.13 brew install llvm brew link --overwrite python@3.12 -brew link --overwrite python@3.13 pip3 install yq export CC=clang