Merge pull request #2379 from KomodoPlatform/ci-test

use default libtool
KomodoPlatform · Oct 19, 2023 · 62cc697 · 62cc697
2 parents a28d71c + acf930d
commit 62cc697
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -55,13 +55,13 @@ jobs:
             host: 'linux'
 
           - name: osx-release
-            os: macos-11
+            os: macos-12
             qt: '5.15.2'
             type: 'Release'
             host: 'mac'
 
           - name: osx-debug
-            os: macos-11
+            os: macos-12
             qt: '5.15.2'
             type: 'Debug'
             host: 'mac'

diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-brew update
-
-brew unlink libtool
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
-brew install libtool.rb
+# Workaround for https://github.com/actions/setup-python/issues/577
 
+brew update
 brew install autoconf \
             automake \
             pkgconfig \
@@ -14,6 +11,7 @@ brew install autoconf \
             ninja \
             gnu-sed \
             coreutils \
+            libtool \
             llvm \
             gnu-getopt
 

diff --git a/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp b/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp
@@ -17,7 +17,7 @@ namespace
                                                               {
                                                                   web::http::client::http_client_config cfg;
                                                                   cfg.set_validate_certificates(false);
-                                                                  cfg.set_timeout(std::chrono::seconds(30));
+                                                                  cfg.set_timeout(std::chrono::seconds(60));
                                                                   return cfg;
                                                               }()};
     t_http_client_ptr g_komodo_prices_client = std::make_unique<web::http::client::http_client>(FROM_STD_STR(g_komodo_prices_endpoint), g_komodo_prices_cfg);