Skip to content

Commit

Permalink
Merge pull request #6 from GLEECBTC/GleecDEX
Browse files Browse the repository at this point in the history
update
  • Loading branch information
gleecdev committed Oct 17, 2021
2 parents 4b436fb + 6957184 commit d4ef27c
Show file tree
Hide file tree
Showing 482 changed files with 33,874 additions and 17,527 deletions.
55 changes: 32 additions & 23 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

include:
- name: ubuntu-qt-5-15-2
os: ubuntu-16.04
os: ubuntu-18.04
qt: '5.15.2'
type: 'release'

Expand Down Expand Up @@ -70,10 +70,10 @@ jobs:
host: 'linux'
target: 'desktop'
dir: '${{ github.workspace }}'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
mirror: https://qt-mirror.dannhauer.de/
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org/
#mirror: https://ftp.fau.de/qtproject/
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
#mirror: https://qt-mirror.dannhauer.de
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
mirror: https://ftp.fau.de/qtproject
modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
aqtversion: '==0.8'
py7zrversion: '==0.6'
Expand All @@ -85,17 +85,17 @@ jobs:
version: ${{ matrix.qt }}
host: 'mac'
target: 'desktop'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
mirror: https://qt-mirror.dannhauer.de/
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org/
#mirror: https://ftp.fau.de/qtproject/
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
#mirror: https://qt-mirror.dannhauer.de
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
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.0-202104091030 qt.tools.ifw.41 -b https://qt-mirror.dannhauer.de/ --outputdir ${{ github.workspace }}/Qt
python3 -m aqt tool mac tools_ifw 4.1.1-202105261132 qt.tools.ifw.41 --outputdir ${{ github.workspace }}/Qt
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
- name: Install QT (Windows)
Expand All @@ -106,18 +106,18 @@ jobs:
host: 'windows'
target: 'desktop'
arch: 'win64_msvc2019_64'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
mirror: https://qt-mirror.dannhauer.de/
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org/
#mirror: https://ftp.fau.de/qtproject/
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
#mirror: https://qt-mirror.dannhauer.de
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
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.0-202104091029 qt.tools.ifw.41 -b https://qt-mirror.dannhauer.de/ --outputdir C:/Qt
python -m aqt tool windows tools_ifw 4.1.1-202105261131 qt.tools.ifw.41 --outputdir C:/Qt
echo "C:/Qt/Tools/QtInstallerFramework/4.0/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo $env:GITHUB_PATH
echo $env:PATH
Expand All @@ -126,11 +126,13 @@ jobs:
if: runner.os == 'Linux'
run: |
export DEBIAN_FRONTEND=noninteractive
export SHELL=/bin/bash
echo "CHOOSENIM_CHOOSE_VERSION=1.4.0" >> $GITHUB_ENV
curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
chmod +x choosenim.sh
./choosenim.sh -y
export PATH=/home/runner/.nimble/bin:$PATH
chmod +x /home/runner/.choosenim/toolchains/nim-1.4.8/bin/*
- name: Install deps (Linux)
if: runner.os == 'Linux'
Expand All @@ -142,10 +144,10 @@ jobs:
- name: Upload env variable for vpkg (Linux)
if: runner.os == 'Linux'
run: |
echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
echo "LDFLAGS=-stdlib=libc++" >> $GITHUB_ENV
echo "CXX=clang++-11" >> $GITHUB_ENV
echo "CC=clang-11" >> $GITHUB_ENV
#echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
#echo "LDFLAGS=-stdlib=libc++" >> $GITHUB_ENV
echo "CXX=clang++-12" >> $GITHUB_ENV
echo "CC=clang-12" >> $GITHUB_ENV
- name: vcpkg deps (All)
uses: KomodoPlatform/run-vcpkg@v7
Expand All @@ -172,10 +174,10 @@ jobs:
export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
export PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/bin:$PATH
export PATH=$HOME/.nimble/bin:$PATH
export CXXFLAGS=-stdlib=libc++
export LDFLAGS=-stdlib=libc++
export CXX=clang++-11
export CC=clang-11
#export CXXFLAGS=-stdlib=libc++
#export LDFLAGS=-stdlib=libc++
export CXX=clang++-12
export CC=clang-12
cd ci_tools_atomic_dex
nimble build -y
Expand Down Expand Up @@ -300,20 +302,23 @@ jobs:
with:
name: ${{ env.artifact_name_zstd }}
path: ./bundled/linux/${{ env.target_name_zstd }}
retention-days: 7

- name: Upload bundle artifact (Linux ZIP)
if: runner.os == 'Linux'
uses: actions/upload-artifact@v2
with:
name: ${{ env.artifact_name_zip }}
path: ./bundled/linux/${{ env.target_name_zip }}
retention-days: 7

- name: Upload bundle artifact (Linux AppImage)
if: runner.os == 'Linux'
uses: actions/upload-artifact@v2
with:
name: ${{ env.artifact_name_appimage }}
path: ./bundled/linux/${{ env.target_name_appimage }}
retention-days: 7

- name: Upload env variable for artifacts (macOS)
if: runner.os == 'macOS'
Expand All @@ -328,13 +333,15 @@ jobs:
with:
name: ${{ env.artifact_name_dmg }}
path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}.dmg
retention-days: 7

- name: Upload artifacts (MacOS installer)
if: runner.os == 'macOS'
uses: actions/upload-artifact@v2
with:
name: ${{ env.artifact_name_installer }}
path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z
retention-days: 7

- name: Upload env variable for artifacts (Windows)
if: runner.os == 'Windows'
Expand All @@ -349,12 +356,14 @@ jobs:
with:
name: ${{ env.artifact_name_zip }}
path: ./bundled/windows/bin.zip
retention-days: 7

- name: Upload artifacts (Windows installer)
if: runner.os == 'Windows'
uses: actions/upload-artifact@v2
with:
name: ${{ env.artifact_name_installer }}
path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
retention-days: 7


26 changes: 26 additions & 0 deletions .github/workflows/sync_mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: GitlabSync

on:
push:
branches:
- '*'
pull_request:
branches:
- dev
delete:
branches:
- '*'

jobs:
sync:
runs-on: ubuntu-latest
name: Git Repo Sync
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: wangchucheng/git-repo-sync@v0.1.0
with:
target-url: ${{ secrets.GITLAB_URL }}
target-username: ${{ secrets.GITLAB_USERNAME }}
target-token: ${{ secrets.GITLAB_TOKEN }}
112 changes: 112 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
image: smk762/qt-ci:latest

stages:
- build
- upload_linux_zip
- upload_linux_tar
- upload_linux_appimage
- test

variables:
GIT_SUBMODULE_STRATEGY: recursive
DOCKER_DRIVER: overlay2
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
VCPKG_DEFAULT_BINARY_CACHE: "$CI_PROJECT_DIR/.cache/vcpkg"
QT_VERSION: "5.15.2"
CMAKE_VERSION: "3.20.5"

cache:
- key: $CI_COMMIT_REF_SLUG
paths:
- atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
- atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
- atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
- key: $CI_PROJECT_NAME
paths:
- "$CI_PROJECT_DIR/.cache/vcpkg"


linux:build:
stage: build
before_script:
- cd $CI_PROJECT_DIR
- mkdir -p .cache/pip
- mkdir -p .cache/vcpkg

script:
# Job Variables
- echo $CI_COMMIT_REF_SLUG
- echo $CI_COMMIT_AUTHOR
- echo $CI_COMMIT_BRANCH
- echo $CI_COMMIT_SHA
- echo $CI_COMMIT_SHORT_SHA
- echo $CI_PROJECT_PATH
- echo $CI_PROJECT_NAME
- echo $QT_VERSION
- echo $CMAKE_VERSION

# Job Path/Env variables
- export DEBIAN_FRONTEND=noninteractive
- export QT_INSTALL_CMAKE_PATH=/opt/Qt/$QT_VERSION/gcc_64/lib/cmake
- export QT_ROOT=/opt/Qt/$QT_VERSION
- export Qt5_DIR=/opt/Qt/$QT_VERSION/gcc_64/lib/cmake/Qt5
- export PATH=/opt/Qt/$QT_VERSION/gcc_64/bin:$PATH
- export PATH=${PATH}:/cmake-$CMAKE_VERSION-linux-x86_64/bin;
- export APPIMAGE_EXTRACT_AND_RUN=1

# Update tar
- export FORCE_UNSAFE_CONFIGURE=1
- wget https://ftp.wayne.edu/gnu/tar/tar-1.34.tar.gz && tar -xvf tar-1.34.tar.gz
- cd tar-1.34 && ./configure && make && make install
- cp src/tar $(which tar)

# Bootstrap Vcpkg
- cd $CI_PROJECT_DIR; ./ci_tools_atomic_dex/vcpkg-repo/bootstrap-vcpkg.sh

# NINJA
- cd $CI_PROJECT_DIR
- rm -rf build_ninja || echo "no build_ninja folder to rm"
- mkdir build_ninja && cd $_
- cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../
- ninja atomicdex-desktop
- ninja install
- cd $CI_PROJECT_DIR
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip .
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst .
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage .

AtomicDex-linux-zip:
stage: upload_linux_zip
allow_failure: true
script:
- echo "Uploading AppImage..."
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.zip"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
when: always
expire_in: 3 days

AtomicDex-linux-AppImage:
stage: upload_linux_appimage
allow_failure: true
script:
- echo "Uploading AppImage..."
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}-AppImage"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
when: always
expire_in: 3 days

AtomicDex-linux-tar:
stage: upload_linux_tar
allow_failure: true
script:
- echo "Uploading tar..."
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.tar.zst"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
when: always
expire_in: 3 days
Loading

0 comments on commit d4ef27c

Please sign in to comment.