Merge pull request #6 from KomodoPlatform/smartdex

sync dev
pbcllc · Mar 28, 2022 · 83f3317 · 83f3317
2 parents d66b234 + d273b47
commit 83f3317
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -58,16 +58,17 @@ jobs:
           submodules: 'true'
       - run: git submodule update --init --recursive
 
-
-      - 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/install-qt-action@v2.14.0
         with:
           version: ${{ matrix.qt }}
+          setup-python: 'false'
           host: 'linux'
           target: 'desktop'
           dir: '${{ github.workspace }}'
@@ -80,6 +81,7 @@ jobs:
         uses: KomodoPlatform/install-qt-action@v2.14.0
         with:
           version: ${{ matrix.qt }}
+          setup-python: 'false'
           host: 'mac'
           target: 'desktop'
           dir: '${{ github.workspace }}'

diff --git a/.github/workflows/atomicdex-desktop-release-vt.yml b/.github/workflows/atomicdex-desktop-release-vt.yml
@@ -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 }}
@@ -20,4 +20,4 @@ jobs:
             .zip$
             .tar.zst$
             .dmg$
-            .7z$
+            .7z$
diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
@@ -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 \
             nim@1.4.8 \