Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v3.006-dev' into v3.008-dev-new
Browse files Browse the repository at this point in the history
* origin/v3.006-dev: (109 commits)
  More of C++/MT4/MT5 error fixes.
  Looks like C++/MT4/MT5 errors are fixed.
  Looks like C++/MT4 errors are fixed. Need some additional fixed for MT5.
  C++ and MQL fixes. Cleaned up Std.h regarding array/reference macros. Added Visual Studio file exclusions into .gitignore.
  C++ tests now compiles.
  WIP. Fixing C++ errors. One step further.
  WIP. Fixing C++ errors. Closer to the end.
  WIP. Fixing C++ errors. Closer to the end.
  WIP. Fixing C++ errors. Stuck on ValueStorage's macros.
  Removes CustomMovingAverage indicator in favor of MA
  Removes Color Line indicator
  Removes Color Candles Daily indicator
  Removes ColorBars indicator
  Indicators: Corrects comments
  Adds Indi_Universal (GH-683)
  PriceRange: Adds README.md
  Adds description for AMA, AO, ATR, DEMA and MA indicators
  Adds description for ASI (Accumulation Swing Index) indicator
  Removes SymbolInfoTest from Test GHA workflow
  Adds PriceRange/tests/Makefile
  ...
  • Loading branch information
kenorb committed Sep 1, 2024
2 parents 751ef0b + 98c546f commit 65eeb3a
Show file tree
Hide file tree
Showing 862 changed files with 16,096 additions and 8,452 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Check

# yamllint disable rule:truthy
# yamllint disable-line rule:truthy
on:
pull_request:
push:
Expand All @@ -10,6 +10,10 @@ jobs:
Pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
- uses: pre-commit/[email protected]
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ~/.cache/pre-commit
key: pre-commit|${{ hashFiles('.pre-commit-config.yaml') }}
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
55 changes: 18 additions & 37 deletions .github/workflows/compile-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,31 @@ name: Compile C++
# yamllint disable-line rule:truthy
on:
pull_request:
paths-ignore:
- '**.md'
paths:
- '**.h'
- '**.mq?'
push:
paths-ignore:
- '**.md'
paths:
- '**.h'
- '**.mq?'

jobs:

FileList:
outputs:
filelist: ${{ steps.get-files.outputs.filelist }}
Compile-Cpp:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set output with list of files
id: get-files
run: |
import glob, json, os
files = glob.glob("**/tests/*.cpp")
print("::set-output name=filelist::{}".format(json.dumps(files)))
shell: python
- name: Display output
run: echo ${{ steps.get-files.outputs.filelist }}

Compile:
runs-on: ubuntu-latest
needs: [FileList]
strategy:
matrix:
file: ${{ fromJson(needs.FileList.outputs.filelist) }}
steps:
- uses: actions/checkout@v2
- name: Install Emscripten toolchain
uses: mymindstorm/setup-emsdk@v11
- uses: actions/checkout@v3
- name: Install CPP compiler
uses: rlalik/[email protected]
with:
compiler: gcc-latest
- name: Compile ${{ matrix.file }} via emcc
if: always()
run: >
emcc -s WASM=1 -s ENVIRONMENT=node -s EXIT_RUNTIME=0 -s NO_EXIT_RUNTIME=1 -s ASSERTIONS=1 -Wall -s
MODULARIZE=1 -s ERROR_ON_UNDEFINED_SYMBOLS=0 --bind -s EXPORTED_FUNCTIONS="[]" -g -std=c++17
"${{ matrix.file }}"
- name: Compile ${{ matrix.file }} via g++
if: always()
run: g++ -g -std=c++17 -c "${{ matrix.file }}"
- name: Compile via make
run: make
Compile-Emscripten:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Emscripten toolchain
uses: mymindstorm/setup-emsdk@v11
- name: Compile via emcc
run: make CC=emcc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Compile
name: Compile MQL

env:
ARTIFACT_PREFIX: ${{ inputs.artifact_prefix || 'mt' }}
Expand All @@ -11,6 +11,7 @@ on:
pull_request:
paths-ignore:
- '**.md'
- '.github/workflows/compile-mql.yml'
push:
paths-ignore:
- '**.md'
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/lint.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/sync-fork.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Sync Fork

# yamllint disable rule:truthy
# yamllint disable-line rule:truthy
on:
push:
branches:
Expand All @@ -14,11 +14,11 @@ jobs:
if: github.repository != 'EA31337/EA31337-classes'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
path: upstream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
name: Test Account
name: Test Exchange/Account

# yamllint disable-line rule:truthy
on:
pull_request:
paths:
- 'Account/**.h'
- '.github/workflows/test-account.yml'
- 'Exchange/Account/**'
- '.github/workflows/test-exchange/account.yml'
push:
paths:
- 'Account/**.h'
- '.github/workflows/test-account.yml'
- 'Exchange/Account/**'
- '.github/workflows/test-exchange/account.yml'

jobs:

Expand All @@ -22,11 +22,11 @@ jobs:
path: Account
skip_cleanup: true

Account-Tests-MQL4:
Tests-MQL4:
defaults:
run:
shell: bash
working-directory: Account/tests
working-directory: Exchange/Account/tests
if: false
needs: compile
runs-on: ubuntu-latest
Expand All @@ -37,7 +37,7 @@ jobs:
- AccountForex.test
- AccountMt.test
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: files-ex4
- name: Run ${{ matrix.test }}
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/test-exchange-symbolinfo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
---
name: Test Exchange/SymbolInfo

# yamllint disable-line rule:truthy
on:
pull_request:
paths:
- 'Exchange/SymbolInfo/**'
- '.github/workflows/test-exchange/symbolinfo.yml'
push:
paths:
- 'Exchange/SymbolInfo/**'
- '.github/workflows/test-exchange/symbolinfo.yml'

jobs:

Compile:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Compile
uses: fx31337/mql-compile-action@master
with:
init-platform: true
path: 'Exchange/SymbolInfo/tests'
verbose: true
- name: Print compiled files
run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
shell: powershell
- name: Upload artifacts (MQL4)
uses: actions/upload-artifact@v3
with:
name: files-ex4
path: '**/*.ex4'
- name: Upload artifacts (MQL5)
uses: actions/upload-artifact@v3
with:
name: files-ex5
path: '**/*.ex5'

Tests-MQL4:
defaults:
run:
shell: bash
working-directory: Exchange/SymbolInfo/tests
needs: Compile
runs-on: ubuntu-latest
strategy:
matrix:
test:
- SymbolInfo.test
steps:
- uses: actions/download-artifact@v3
with:
name: files-ex4
- name: Run ${{ matrix.test }}
uses: fx31337/mql-tester-action@master
with:
Script: ${{ matrix.test }}
timeout-minutes: 10
4 changes: 2 additions & 2 deletions .github/workflows/test-exchange.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
path: Exchange
skip_cleanup: true

Exchange-Tests-MQL4:
Tests-MQL4:
defaults:
run:
shell: bash
Expand All @@ -37,7 +37,7 @@ jobs:
test:
- Exchange.test
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: files-ex4
- name: Run ${{ matrix.test }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-indicator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
path: Indicator
skip_cleanup: true

Indicator-Tests-MQL4:
Tests-MQL4:
defaults:
run:
shell: bash
Expand All @@ -43,7 +43,7 @@ jobs:
- IndicatorTick.test
- IndicatorRenko.test
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: files-ex4
- name: Run ${{ matrix.test }}
Expand All @@ -52,7 +52,7 @@ jobs:
BtDays: 4-8
BtMonths: 1
BtYears: 2021
MtVersion: 4.0.0.1359
GitHubApiToken: ${{ github.token }}
RunOnError: show_logs 200
TestExpert: ${{ matrix.test }}
timeout-minutes: 10
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/test-indicators-bitwise.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
---
name: Test Indicators (Bitwise)

# yamllint disable-line rule:truthy
on:
pull_request:
paths:
- 'Indicator/**'
- 'Indicators/Bitwise/**'
- '.github/workflows/test-indicators-bitwise.yml'
push:
paths:
- 'Indicator**'
- 'Indicators/Bitwise/**'
- '.github/workflows/test-indicators-bitwise.yml'

jobs:

Compile:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Compile
uses: fx31337/mql-compile-action@master
with:
init-platform: true
path: 'Indicators/Bitwise/tests'
verbose: true
- name: Print compiled files
run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
shell: powershell
- name: Upload artifacts (MQL4)
uses: actions/upload-artifact@v3
with:
name: files-ex4
path: '**/*.ex4'
- name: Upload artifacts (MQL5)
uses: actions/upload-artifact@v3
with:
name: files-ex5
path: '**/*.ex5'

Tests-MQL4:
defaults:
run:
shell: bash
working-directory: Indicators/Bitwise/tests
needs: Compile
runs-on: ubuntu-latest
strategy:
matrix:
test:
- Indi_Candle.test
- Indi_Pattern.test
steps:
- uses: actions/download-artifact@v3
with:
name: files-ex4
- name: Run ${{ matrix.test }}
uses: fx31337/mql-tester-action@master
with:
BtDays: 4-8
BtMonths: 1
BtYears: 2021
GitHubApiToken: ${{ github.token }}
RunOnError: show_logs 200
TestExpert: ${{ matrix.test }}
timeout-minutes: 10
Loading

0 comments on commit 65eeb3a

Please sign in to comment.