Merge pull request #449 from ArkScript-lang/ci/modules

Re-enable modules tests in the CI

.github/workflows/ci.yml

@@ -113,11 +113,15 @@ jobs:
         run: |
           mkdir -p artifact/lib/std
           # Linux/MacOS
-          cp build/arkscript artifact || true
-          cp build/libArkReactor.* artifact || true
+          if [[ '${{ startsWith(matrix.config.os, 'ubuntu') }}' == 'true' ]] || [[ '${{ startsWith(matrix.config.os, 'macos') }}' == 'true' ]]; then
+            cp build/arkscript artifact || true
+            cp build/libArkReactor.* artifact || true
+          fi
           # Windows
-          cp build/$BUILD_TYPE/arkscript.exe artifact || true
-          cp build/$BUILD_TYPE/ArkReactor.dll artifact  || true
+          if [[ '${{ startsWith(matrix.config.os, 'windows') }}' == 'true' ]]; then
+            cp build/$BUILD_TYPE/arkscript.exe artifact || true
+            cp build/$BUILD_TYPE/ArkReactor.dll artifact  || true
+          fi
           # Generic
           cp lib/*.arkm artifact/lib
           cp lib/std/*.ark artifact/lib/std
@@ -178,12 +182,12 @@ jobs:
           export ASAN_OPTIONS=detect_odr_violation=0
           (cd tests/arkscript ; bash ./run-tests)
 
-      # FIXME: re-enable later on
-      #- name: Modules tests
-      #  shell: bash
-      #  run: |
-      #    export ASAN_OPTIONS=detect_odr_violation=0
-      #    (source ./lib/modules/.github/run-tests)
+      - name: Modules tests
+        shell: bash
+        run: |
+          export ASAN_OPTIONS=detect_odr_violation=0
+          chmod u+x ./lib/modules/.github/run-tests
+          (./lib/modules/.github/run-tests src)
 
       - name: Runtime error message generation tests
         shell: bash

.github/workflows/setup-compilers/action.yaml

@@ -89,8 +89,8 @@ runs:
          -DCMAKE_C_COMPILER=${{ steps.compilers.outputs.cc }} \
          -DCMAKE_CXX_COMPILER=${{ steps.compilers.outputs.cxx }} \
          -DARK_SANITIZERS=${{ inputs.sanitizers }} \
-         -DARK_BUILD_EXE=On -DARK_BUILD_MODULES=On -DARK_MOD_ALL=Off -DARK_TESTS=On
-        cmake --build build --config $BUILD_TYPE -- -j $(nproc)
+         -DARK_BUILD_EXE=On -DARK_BUILD_MODULES=On -DARK_MOD_ALL=On -DARK_MOD_DRAFT=On -DARK_TESTS=On
+        cmake --build build --config $BUILD_TYPE -j $(nproc)
 
     - name: Configure CMake Ark
       if: startsWith(inputs.os_name, 'windows')
@@ -103,5 +103,5 @@ runs:
           -G "Visual Studio 17 2022" -T v143 \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
           -DARK_SANITIZERS=${{ matrix.config.sanitizers }} \
-          -DARK_BUILD_EXE=On -DARK_BUILD_MODULES=On -DARK_MOD_ALL=Off -DARK_TESTS=On $additional_args
-        cmake --build build --config $BUILD_TYPE
+          -DARK_BUILD_EXE=On -DARK_BUILD_MODULES=On -DARK_MOD_ALL=On -DARK_MOD_DRAFT=On -DARK_TESTS=On $additional_args
+        cmake --build build --config $BUILD_TYPE -j $(nproc)

CMakeLists.txt

@@ -115,7 +115,7 @@ if (UNIX OR LINUX)
 endif ()
 
 # configuring Constants.hpp
-message(STATUS "ArkScript version ${ARK_VERSION_MAJOR}.${ARK_VERSION_MINOR}.${ARK_VERSION_PATCH}")
+message(STATUS "ArkScript version ${ARK_VERSION_MAJOR}.${ARK_VERSION_MINOR}.${ARK_VERSION_PATCH}-${ARK_COMMIT}")
 configure_file(
         ${ark_SOURCE_DIR}/include/Ark/Constants.hpp.in
         ${ark_SOURCE_DIR}/include/Ark/Constants.hpp)