From 47b671c7473e79aa47cac54d0b82e8bef9625313 Mon Sep 17 00:00:00 2001
From: Florian OMNES <26088210+flomnes@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:42:02 +0100
Subject: [PATCH] Tests run at the end

---
 .github/workflows/ubuntu.yml          | 97 +++++++++++++--------------
 .github/workflows/windows-release.yml | 78 ++++++++++-----------
 2 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 07941c0e6d..648be00ac0 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -103,6 +103,53 @@ jobs:
       run: |
              cmake --build _build --config release -j2
 
+    - name: Installer .deb creation
+      run: |
+           cd _build
+           cpack -G DEB
+
+    - name: .tar.gz creation
+      run: |
+           cd _build
+           cpack -G TGZ
+
+    - name: Solver archive creation
+      run: |
+           cd _build
+           cmake --install . --prefix install
+           pushd .
+           cd install/bin
+           tar czf ../../antares-solver_ubuntu20.04.tar.gz antares-*-solver libsirius_solver.so
+           popd
+           rm -rf install
+
+    - name: Installer archive upload push
+      uses: actions/upload-artifact@v3
+      with:
+        path: _build/*.tar.gz
+
+    - name: Installer deb upload push
+      uses: actions/upload-artifact@v3
+      with:
+        path: _build/*.deb
+
+  publish_assets:
+    name: Publish assets
+    needs: build
+    runs-on: ${{needs.build.outputs.os}}
+    steps:
+    - name: Download all artifacts
+      if: ${{ env.IS_RELEASE == 'true' }}
+      uses: actions/download-artifact@v3
+
+
+    - name: Publish assets
+      if: ${{ env.IS_RELEASE == 'true' }}
+      uses: alexellis/upload-assets@0.4.0
+      env:
+          GITHUB_TOKEN: ${{ github.token }}
+      with:
+          asset_paths: '["*/*.tar.gz", "*/*.deb"]'
 
     # simtest
     - name: Read simtest version
@@ -218,52 +265,4 @@ jobs:
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: long-tests-3
-        os: ${{ matrix.test-platform }}
-
-    - name: Installer .deb creation
-      run: |
-           cd _build
-           cpack -G DEB
-
-    - name: .tar.gz creation
-      run: |
-           cd _build
-           cpack -G TGZ
-
-    - name: Solver archive creation
-      run: |
-           cd _build
-           cmake --install . --prefix install
-           pushd .
-           cd install/bin
-           tar czf ../../antares-solver_ubuntu20.04.tar.gz antares-*-solver libsirius_solver.so
-           popd
-           rm -rf install
-
-    - name: Installer archive upload push
-      uses: actions/upload-artifact@v3
-      with:
-        path: _build/*.tar.gz
-
-    - name: Installer deb upload push
-      uses: actions/upload-artifact@v3
-      with:
-        path: _build/*.deb
-
-  publish_assets:
-    name: Publish assets
-    needs: build
-    runs-on: ${{needs.build.outputs.os}}
-    steps:
-    - name: Download all artifacts
-      if: ${{ env.IS_RELEASE == 'true' }}
-      uses: actions/download-artifact@v3
-
-
-    - name: Publish assets
-      if: ${{ env.IS_RELEASE == 'true' }}
-      uses: alexellis/upload-assets@0.4.0
-      env:
-          GITHUB_TOKEN: ${{ github.token }}
-      with:
-          asset_paths: '["*/*.tar.gz", "*/*.deb"]'
+        os: ${{ matrix.test-platform }}    
\ No newline at end of file
diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml
index e6d7c38665..9539a7cb9f 100644
--- a/.github/workflows/windows-release.yml
+++ b/.github/workflows/windows-release.yml
@@ -122,6 +122,45 @@ jobs:
       shell: bash
       run: rm -rf ${{ github.workspace }}/src/_build/_deps
 
+    - name: .zip creation
+      shell: bash
+      run: |
+           cd _build
+           cpack -G ZIP
+           export ZIP_NAME=$(ls *.zip)
+           echo "ZIP_NAME=$ZIP_NAME" >> $GITHUB_ENV
+
+    - name: Solver archive creation
+      shell: bash
+      run: |
+           cd _build
+           zip -r antares-solver_windows.zip solver/Release/antares-*-solver.exe solver/Release/*.dll
+
+    - name: NSIS Installer creation
+      shell: bash
+      run: |
+           rm -rf src/tests/resources/Antares_Simulator_Tests
+           cd _build
+           cpack -GNSIS
+           export NSIS_NAME=$(ls *.exe)
+           echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV
+
+    - name: Upload NSIS logs
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: NSISOutput.log
+        path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log
+
+    - name: Upload release assets
+      uses: softprops/action-gh-release@v0.1.15
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: |
+          _build/${{env.NSIS_NAME}}
+          _build/${{env.ZIP_NAME}}
+          _build/solver.zip
+
     # simtest
     - name: Read simtest version
       id: simtest-version
@@ -164,42 +203,3 @@ jobs:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: long-tests-3
         os: ${{ matrix.test-platform }}
-
-    - name: .zip creation
-      shell: bash
-      run: |
-           cd _build
-           cpack -G ZIP
-           export ZIP_NAME=$(ls *.zip)
-           echo "ZIP_NAME=$ZIP_NAME" >> $GITHUB_ENV
-
-    - name: Solver archive creation
-      shell: bash
-      run: |
-           cd _build
-           zip -r antares-solver_windows.zip solver/Release/antares-*-solver.exe solver/Release/*.dll
-
-    - name: NSIS Installer creation
-      shell: bash
-      run: |
-           rm -rf src/tests/resources/Antares_Simulator_Tests
-           cd _build
-           cpack -GNSIS
-           export NSIS_NAME=$(ls *.exe)
-           echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV
-
-    - name: Upload NSIS logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: NSISOutput.log
-        path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log
-
-    - name: Upload release assets
-      uses: softprops/action-gh-release@v0.1.15
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: |
-          _build/${{env.NSIS_NAME}}
-          _build/${{env.ZIP_NAME}}
-          _build/solver.zip