Merge remote-tracking branch 'upstream/dev' into nogeo

cipig · Jun 19, 2024 · fe8e396 · fe8e396
2 parents f68c93e + f3be2a0
commit fe8e396
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml
@@ -367,7 +367,7 @@ jobs:
 
   windows-release:
     name: Win Build/Release
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2
@@ -445,7 +445,7 @@ jobs:
 
   windows-debug:
     name: Win Build/Debug
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -62,17 +62,17 @@ jobs:
 #            type: 'Debug'
 #            host: 'mac'
 
-#          - name: windows-release
-#            os: windows-latest
-#            qt: '5.15.2'
-#            type: 'Release'
-#            host: 'windows'
+          - name: windows-release
+            os: windows-2019
+            qt: '5.15.2'
+            type: 'Release'
+            host: 'windows'
 
-#          - name: windows-debug
-#            os: windows-latest
-#            qt: '5.15.2'
-#            type: 'Debug'
-#            host: 'windows'
+          - name: windows-debug
+            os: windows-2019
+            qt: '5.15.2'
+            type: 'Debug'
+            host: 'windows'
 
     steps:
       - uses: actions/checkout@v3

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,13 +60,13 @@ endif ()
 ##! We fetch our dependencies
 if (APPLE)
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-mac-x86-64.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
             URL https://sdk.devbuilds.komodo.earth/gas-limit-override/mm2_2dc40ec-linux-x86-64.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-win-x86-64.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Win64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)