Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into add_coins
Browse files Browse the repository at this point in the history
  • Loading branch information
cipig committed Mar 26, 2022
2 parents 63dcbc2 + 8869d04 commit 0298bd1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,17 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
submodules: 'true'


- uses: actions/setup-python@v2
- name: Setup Python
uses: actions/setup-python@v3
with:
python-version: '3.8'
python-version: '3.9'

- name: Install QT (Linux)
if: runner.os == 'Linux'
uses: KomodoPlatform/[email protected]
with:
version: ${{ matrix.qt }}
setup-python: 'false'
host: 'linux'
target: 'desktop'
dir: '${{ github.workspace }}'
Expand All @@ -79,6 +80,7 @@ jobs:
uses: KomodoPlatform/[email protected]
with:
version: ${{ matrix.qt }}
setup-python: 'false'
host: 'mac'
target: 'desktop'
dir: '${{ github.workspace }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/atomicdex-desktop-release-vt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
-
name: VirusTotal Scan
uses: crazy-max/ghaction-virustotal@v2.2.1
uses: crazy-max/ghaction-virustotal@v2.4.1
with:
vt_api_key: ${{ secrets.VT_API_KEY }}
github_token: ${{ github.token }}
Expand All @@ -20,4 +20,4 @@ jobs:
.zip$
.tar.zst$
.dmg$
.7z$
.7z$
5 changes: 4 additions & 1 deletion ci_tools_atomic_dex/ci_scripts/osx_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ brew update
brew tap-new $USER/local-nim
brew extract --version=1.4.8 nim $USER/local-nim

brew unlink libtool
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
brew install libtool.rb

brew install autoconf \
automake \
libtool \
pkgconfig \
wget \
[email protected] \
Expand Down

0 comments on commit 0298bd1

Please sign in to comment.