From cbd9dd548864cf2d096425a6250bc0ebc96293f1 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 11 Oct 2023 18:40:01 +0800 Subject: [PATCH 1/8] use default libtool --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index f47910cab6..4785e00e6f 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -2,9 +2,6 @@ brew update -brew unlink libtool -wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb -brew install libtool.rb brew install autoconf \ automake \ @@ -14,6 +11,7 @@ brew install autoconf \ ninja \ gnu-sed \ coreutils \ + libtool \ llvm \ gnu-getopt From 5a5aa717f178622be8eb02ea72287aca1826382e Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 11 Oct 2023 18:42:54 +0800 Subject: [PATCH 2/8] rm conflicting links --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 4785e00e6f..7b5fdacd4a 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -1,8 +1,13 @@ #!/bin/bash -brew update - +# 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 update brew install autoconf \ automake \ pkgconfig \ From 3647f8fd2d475702db63697ede1099988f2fe9ff Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 11 Oct 2023 21:25:49 +0800 Subject: [PATCH 3/8] wildcard removal machine --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 7b5fdacd4a..c91cf50cc0 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -1,11 +1,11 @@ #!/bin/bash # 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 +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 update brew install autoconf \ From f154aa36aaaf5d81d2128011f1a21372278e007c Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 12 Oct 2023 12:29:24 +0800 Subject: [PATCH 4/8] install llvm first --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index c91cf50cc0..6dbdd01ec0 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -8,6 +8,7 @@ rm /usr/local/bin/python3* || true rm /usr/local/bin/python3-config* || true brew update +brew install llvm brew install autoconf \ automake \ pkgconfig \ @@ -17,7 +18,6 @@ brew install autoconf \ gnu-sed \ coreutils \ libtool \ - llvm \ gnu-getopt pip3 install yq From 1b6fbd99018ded08e6a6169dd81141f87a7a5e6c Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 12 Oct 2023 12:33:08 +0800 Subject: [PATCH 5/8] install llvm@16 before brew update --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 6dbdd01ec0..4c9ce17f30 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -7,8 +7,8 @@ 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 llvm brew install autoconf \ automake \ pkgconfig \ From 43afa323f57a6ee3436af14993b86fdceb9d1c9f Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 12 Oct 2023 15:20:54 +0800 Subject: [PATCH 6/8] try macos12 --- .github/workflows/atomicdex-desktop-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 7a61079109..c100e2a34d 100644 --- 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' From 9b14cbc570fd2e4f7a1d48fb9f94b08a031cef48 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 13 Oct 2023 21:21:48 +0800 Subject: [PATCH 7/8] prices every 60 sec --- src/core/atomicdex/api/komodo_prices/komodo.prices.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp b/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp index f0616ad4d6..2254fdbabe 100644 --- 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(FROM_STD_STR(g_komodo_prices_endpoint), g_komodo_prices_cfg); From acf930df515534f809ba622a8bc768bf6a214e15 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 18 Oct 2023 12:31:55 +0800 Subject: [PATCH 8/8] revert osx script changes --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 4c9ce17f30..35c101b085 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -1,13 +1,7 @@ #!/bin/bash # 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 \ @@ -18,6 +12,7 @@ brew install autoconf \ gnu-sed \ coreutils \ libtool \ + llvm \ gnu-getopt pip3 install yq