Merges two compile workflows into one

EA31337 · Feb 18, 2024 · 88936f6 · 88936f6
1 parent 810cb75
commit 88936f6
Showing 1 changed file with 23 additions and 11 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -17,13 +17,13 @@ jobs:
     name: Installs platform (4)
     uses: EA31337/EA-Tester/.github/workflows/platform-linux.yml@dev
     with:
-      artifact_name: mt4
+      artifact_name: .mt4
       version: 4
   mt5:
     name: Installs platform (5)
     uses: EA31337/EA-Tester/.github/workflows/platform-linux.yml@dev
     with:
-      artifact_name: mt5
+      artifact_name: .mt5
       version: 5
 
   compile-ea:
@@ -35,22 +35,36 @@ jobs:
     needs: [mt4, mt5]
     runs-on: windows-latest
     steps:
+
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: .mt4
+
       - uses: actions/download-artifact@v4
         with:
-          name: mt${{ matrix.version }}
-          path: .mt${{ matrix.version }}
+          name: .mt5
+
       - name: List MQL files
         run: '(Get-ChildItem -Recurse -Path . -Include *.mq[45]).fullname'
         shell: powershell
-      - name: Compiles EA
+
+      - name: Compiles MQL4
+        uses: fx31337/mql-compile-action@master
+        with:
+          mt-path: .mt4
+          path: src\EA31337-Libre.mq4
+          verbose: true
+
+      - name: Compiles MQL5
         uses: fx31337/mql-compile-action@master
         with:
-          mt-path: .mt?
-          path: src\EA31337-Libre.mq${{ matrix.version }}
+          mt-path: .mt5
+          path: src\EA31337-Libre.mq5
           verbose: true
 
       - name: List compiled files
@@ -59,11 +73,9 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: EA-Libre.ex${{ matrix.version }}
+          name: EA-Libre
           path: 'src/*.ex?'
-    strategy:
-      matrix:
-        version: [4, 5]
+
   clean-up:
     name: Clean-up
     needs: [compile-ea]