Add back tests on CI, rename CI files and remove compiling HTML versi…

…on for non_regression
Lecrapouille · Dec 17, 2023 · 19a2fa4 · 19a2fa4
1 parent 87ef8d6
commit 19a2fa4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml → .github/workflows/non_regression.yml b/.github/workflows/ci.yml → .github/workflows/non_regression.yml
@@ -10,27 +10,6 @@ on:
       - dev-refactor
 
 jobs:
-  build_html5:
-    name: Build with Emscripten
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Install system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install pkg-config libmosquitto-dev libx11-dev libxinerama-dev
-          sudo apt-get install libasound2-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev libxinerama-dev
-      - name: Install Emscripten
-        uses: mymindstorm/setup-emsdk@v11
-      - name: Checkout TimedPetriNetEditor
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Compile TimedPetriNetEditor
-        run: |
-          make download-external-libs
-          emmake make compile-external-libs
-          emmake make -j`nproc --all`
-
   non_regression_linux:
     name: Non regression tests on Linux
     runs-on: ubuntu-20.04
@@ -56,11 +35,11 @@ jobs:
           cd googletest-release-1.11.0
           cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
           sudo make install
-#      - name: Do non regression tests
-#        run: |
-#          cd tests
-#          make -j`nproc --all`
-#          ./build/TimedPetriNetEditor-UnitTest
+      - name: Do non regression tests
+        run: |
+          cd tests
+          make -j`nproc --all`
+          ./build/TimedPetriNetEditor-UnitTest
 
   non_regression_macos:
     name: Non regression tests on MacOS X
@@ -85,11 +64,11 @@ jobs:
           cd googletest-release-1.11.0
           cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
           sudo make install
-#      - name: Do non regression tests
-#        run: |
-#          cd tests
-#          make -j`sysctl -n hw.logicalcpu`
-#          ./build/TimedPetriNetEditor-UnitTest
+      - name: Do non regression tests
+        run: |
+          cd tests
+          make -j`sysctl -n hw.logicalcpu`
+          ./build/TimedPetriNetEditor-UnitTest
       - name: Create the DMG file
         run: |
           hdiutil create -format UDZO -srcfolder build/TimedPetriNetEditor.app build/TimedPetriNetEditor.dmg

diff --git a/.github/workflows/publish.yml → .github/workflows/publish_web_version.yml b/.github/workflows/publish.yml → .github/workflows/publish_web_version.yml
@@ -1,4 +1,4 @@
-name: Publish TimedPetriNetEditor on GitHub page
+name: Publish the online TimedPetriNetEditor version on GitHub page
 on:
   push:
     branches:
@@ -40,4 +40,4 @@ jobs:
           cp build/TimedPetriNetEditor.* .
           git add TimedPetriNetEditor.*
           git commit -m "Automated commit"
-          git push
+          git push