Merge remote-tracking branch 'upstream/ci-test' into nogeo

cipig · Oct 13, 2023 · c8c2aa4 · c8c2aa4
2 parents 9650d67 + 9b14cbc
commit c8c2aa4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
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,14 @@
 #!/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
+rm /usr/local/bin/2to3* || true
+rm /usr/local/bin/idle3* || true
+rm /usr/local/bin/pydoc3* || true
+rm /usr/local/bin/python3* || true
+rm /usr/local/bin/python3-config* || true
 
+brew install llvm@16
+brew update
 brew install autoconf \
             automake \
             pkgconfig \
@@ -14,7 +17,7 @@ brew install autoconf \
             ninja \
             gnu-sed \
             coreutils \
-            llvm \
+            libtool \
             gnu-getopt
 
 pip3 install yq

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);