Skip to content

Commit

Permalink
Merge pull request #8 from KomodoPlatform/GleecDEX
Browse files Browse the repository at this point in the history
update GleecDEX 0.5.4
  • Loading branch information
gleecdev committed Jan 3, 2022
2 parents d4ef27c + fecda01 commit d079f4e
Show file tree
Hide file tree
Showing 427 changed files with 20,432 additions and 15,407 deletions.
75 changes: 39 additions & 36 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ jobs:
target: 'desktop'
dir: '${{ github.workspace }}'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
#mirror: https://qt-mirror.dannhauer.de
mirror: https://qt-mirror.dannhauer.de
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
mirror: https://ftp.fau.de/qtproject
#mirror: https://ftp.fau.de/qtproject
modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
aqtversion: '==0.8'
py7zrversion: '==0.6'
Expand All @@ -86,17 +86,19 @@ jobs:
host: 'mac'
target: 'desktop'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
#mirror: https://qt-mirror.dannhauer.de
mirror: https://qt-mirror.dannhauer.de
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
mirror: https://ftp.fau.de/qtproject
#mirror: https://ftp.fau.de/qtproject
dir: '${{ github.workspace }}'
modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'

- name: Install QT IFW (MacOS)
if: runner.os == 'macOS'
run: |
python3 -m aqt tool mac tools_ifw 4.1.1-202105261132 qt.tools.ifw.41 --outputdir ${{ github.workspace }}/Qt
python3 -m aqt tool mac tools_ifw 4.2.0-0-202111080927 qt.tools.ifw.42 --outputdir ${{ github.workspace }}/Qt
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.2/bin" >> $GITHUB_PATH
- name: Install QT (Windows)
if: runner.os == 'Windows'
Expand All @@ -107,18 +109,20 @@ jobs:
target: 'desktop'
arch: 'win64_msvc2019_64'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
#mirror: https://qt-mirror.dannhauer.de
mirror: https://qt-mirror.dannhauer.de
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
mirror: https://ftp.fau.de/qtproject
#mirror: https://ftp.fau.de/qtproject
dir: 'C:\'
modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'

- name: Install QT IFW (Windows)
if: runner.os == 'Windows'
run: |
python -m pip install --upgrade pip
python -m aqt tool windows tools_ifw 4.1.1-202105261131 qt.tools.ifw.41 --outputdir C:/Qt
python -m aqt tool windows tools_ifw 4.2.0-0-202111080926 qt.tools.ifw.42 --outputdir C:/Qt
echo "C:/Qt/Tools/QtInstallerFramework/4.0/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:/Qt/Tools/QtInstallerFramework/4.1/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:/Qt/Tools/QtInstallerFramework/4.2/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo $env:GITHUB_PATH
echo $env:PATH
Expand All @@ -127,11 +131,13 @@ jobs:
run: |
export DEBIAN_FRONTEND=noninteractive
export SHELL=/bin/bash
echo "CHOOSENIM_CHOOSE_VERSION=1.4.0" >> $GITHUB_ENV
echo "CHOOSENIM_CHOOSE_VERSION=1.4.8" >> $GITHUB_ENV
export CHOOSENIM_CHOOSE_VERSION=1.4.8
curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
chmod +x choosenim.sh
./choosenim.sh -y
export PATH=/home/runner/.nimble/bin:$PATH
ls /home/runner/.choosenim/toolchains
chmod +x /home/runner/.choosenim/toolchains/nim-1.4.8/bin/*
- name: Install deps (Linux)
Expand Down Expand Up @@ -250,38 +256,35 @@ jobs:
#python upload.py --sha `git rev-parse HEAD` -n "[Doctest Linux]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
#echo "Uploading tests on Linux finished"

#- name: Running Tests (MacOS)
# working-directory: ci_tools_atomic_dex
# if: runner.os == 'macOS' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
# run: |
# export REPORT_CI_TOKEN=${{ secrets.REPORT_CI_TOKEN_SECRET }}
# export ATOMICDEX_TEST_SEED=${{ secrets.ATOMICDEX_TEST_SEED }}
# export ATOMICDEX_PASSWORD=${{ secrets.ATOMICDEX_PASSWORD }}
# export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
# export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
# export CC=clang
# export CXX=clang++
# echo "Running tests"
# ./ci_tools_atomic_dex tests ${{ matrix.type }}
# cd build-${{ matrix.type }}/bin/${{ env.DEX_PROJECT_NAME }}_tests.app/Contents/MacOS
# cat ${{ env.DEX_PROJECT_NAME }}-tests-result.xml
- name: Running Tests (MacOS)
working-directory: ci_tools_atomic_dex
if: runner.os == 'macOS' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
run: |
export REPORT_CI_TOKEN=${{ secrets.REPORT_CI_TOKEN_SECRET }}
export ATOMICDEX_TEST_SEED=${{ secrets.ATOMICDEX_TEST_SEED }}
export ATOMICDEX_PASSWORD=${{ secrets.ATOMICDEX_PASSWORD }}
export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
export CC=clang
export CXX=clang++
echo "Running tests"
#./ci_tools_atomic_dex tests ${{ matrix.type }}
#cd build-${{ matrix.type }}/bin/${{ env.DEX_PROJECT_NAME }}_tests.app/Contents/MacOS
#cat ${{ env.DEX_PROJECT_NAME }}-tests-result.xml
#curl https://report.ci/upload.py --output upload.py
# ls
#python upload.py --sha `git rev-parse HEAD` -n "[Doctest MacOS ${{ matrix.type }}]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
#echo "Uploading tests on OSX finished"

#- name: Running Tests (Windows)
# shell: powershell
# working-directory: ci_tools_atomic_dex
# if: runner.os == 'Windows' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
# run: |
# echo "Running tests"
# $Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
# $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
# cmd /c '.\ci_tools_atomic_dex.exe tests release 2>&1'
# cd build-Release
# cd bin
# ls
- name: Running Tests (Windows)
shell: powershell
if: runner.os == 'Windows' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
run: |
echo "Running tests"
$Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
$Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
cd b\bin
./${{ env.DEX_PROJECT_NAME }}_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
#Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
#python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "ci_tools_atomic_dex/vcpkg-custom-ports"]
path = ci_tools_atomic_dex/vcpkg-custom-ports
url = https://github.com/KomodoPlatform/vcpkg-custom-ports
[submodule "atomic_defi_design/imports/bignumberjs/bignumber.js"]
path = atomic_defi_design/imports/bignumberjs/bignumber.js
url = https://github.com/KomodoPlatform/bignumber.js.git
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.18)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

Expand All @@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
include(qt_prerequisites)
include(cfg_hash)

project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.2)
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.4)
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")

include(cmake_default_options)
Expand Down Expand Up @@ -61,13 +61,13 @@ endif ()
##! We fetch our dependencies
if (APPLE)
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4401/mm2-87837cb54-Darwin-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Darwin-Release.zip)
elseif (UNIX AND NOT APPLE)
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4401/mm2-87837cb54-Linux-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Linux-Release.zip)
else ()
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4401/mm2-87837cb54-Windows_NT-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Windows_NT-Release.zip)
endif ()

#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
Expand Down
Loading

0 comments on commit d079f4e

Please sign in to comment.