From b89517cfeddecd5328cf7bd3a19ff130c43a23a0 Mon Sep 17 00:00:00 2001
From: kenorb <kenorb@users.noreply.github.com>
Date: Mon, 9 Sep 2024 21:39:21 +0100
Subject: [PATCH] CI: Corrects Test workflow

---
 .github/workflows/test.yml | 97 ++++++++++++++------------------------
 1 file changed, 35 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 039479b..7197668 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,85 +1,58 @@
 ---
-name: Backtest
+name: Test
 
 # yamllint disable-line rule:truthy
 on:
   pull_request:
     branches:
-      - '*dev*'
-      - 'main'
       - 'master'
+      - '*dev*'
     paths-ignore:
       - '*.md'
   push:
     branches:
-      - '*dev*'
-      - 'main'
       - 'master'
+      - '*dev*'
     paths-ignore:
       - '*.md'
 
 jobs:
-  Compile:
-    defaults:
-      run:
-        shell: powershell
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/checkout@v3
-        with:
-          path: Include/EA31337-classes
-          ref: v3.000.2
-          repository: EA31337/EA31337-classes
-      - name: Compile for MQL4
-        uses: fx31337/mql-compile-action@master
-        with:
-          include: .
-          init-platform: true
-          mt-version: 5.0.0.2361
-          path: Stg_Oscillator_Cross_Zero.mq4
-          verbose: true
-      - name: Compile for MQL5
-        uses: fx31337/mql-compile-action@master
-        with:
-          include: .
-          mt-version: 5.0.0.2515
-          path: Stg_Oscillator_Cross_Zero.mq5
-          verbose: true
-      - name: List compiled files
-        run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
-      - run: Get-Location
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: EA
-          path: '*.ex[45]'
-  Test:
-    needs: Compile
+
+  compile:
+    name: Compile
+    uses: ./.github/workflows/compile.yml
+
+  test:
+    name: Test
+    needs: compile
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        month: [1]
-        year: [2019, 2020]
+        file:
+          - Stg_Oscillator_Cross_Zero
+        year: [2022, 2024]
+        version: [5]
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: EA
-      - name: Run strategy
-        uses: ea31337/mql-tester-action@dev
+          merge-multiple: true
+          pattern: Strategy-ex${{ matrix.version }}
+
+      - name: List compiled files
+        run: find . -name '*.ex?' -type f -print
+
+      - name: Test ${{ matrix.year }}
+        uses: fx31337/mql-tester-action@master
         with:
-          BtDeposit: 100000
-          BtDest: ${{ github.workspace }}/_results
-          BtMonths: ${{ matrix.month }}
-          BtYears: ${{ matrix.year }}
-          OptFormatBrief: true
-          OptFormatJson: true
-          OptVerbose: true
-          TestExpert: "Stg_Oscillator_Cross_Zero"
+          Login: ${{ secrets.MT5_LOGIN }}
+          Password: ${{ secrets.MT5_PASSWORD }}
+          Server: MetaQuotes-Demo
+          TestDeposit: 2000
+          TestExpert: ${{ matrix.file }}.ex5
+          TestFromDate: ${{ matrix.year }}.01.01
           TestPeriod: M1
-          TestReportName: Report-${{ matrix.year }}-${{ matrix.month }}
-      - name: Upload results
-        uses: actions/upload-artifact@v3
-        with:
-          name: results
-          path: ${{ github.workspace }}/_results/*.*
+          TestSymbol: EURUSD
+          TestToDate: ${{ matrix.year }}.01.14
+          # yamllint disable-line rule:line-length
+          UrlExpert: file://${{ github.workspace }}/${{ matrix.file }}.ex5
+          Version: 5