Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use default libtool #2379

Merged
merged 8 commits into from
Oct 19, 2023
Merged

use default libtool #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbd9dd5
use default libtool
smk762 Oct 11, 2023
5a5aa71
rm conflicting links
smk762 Oct 11, 2023
3647f8f
wildcard removal machine
smk762 Oct 11, 2023
f154aa3
install llvm first
smk762 Oct 12, 2023
1b6fbd9
install llvm@16 before brew update
smk762 Oct 12, 2023
43afa32
try macos12
smk762 Oct 12, 2023
9b14cbc
prices every 60 sec
smk762 Oct 13, 2023
acf930d
revert osx script changes
smk762 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/atomicdex-desktop-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 3 additions & 5 deletions ci_tools_atomic_dex/ci_scripts/osx_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -14,6 +11,7 @@ brew install autoconf \
ninja \
gnu-sed \
coreutils \
libtool \
llvm \
gnu-getopt

Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/api/komodo_prices/komodo.prices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading