uodating test case script

forsyde · Oct 30, 2023 · 093bc0f · 093bc0f
1 parent 67f6c70
commit 093bc0f
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 117 deletions.
diff --git a/.github/workflows/test-case-studies.yml b/.github/workflows/test-case-studies.yml
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-java:
+  build-and-test:
     strategy:
       matrix:
         jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
@@ -22,7 +22,7 @@ jobs:
       - name: Build java
         run: |
           sudo apt-get update
-          sudo apt-get install -y curl bash build-essential libssl-dev pkg-config dos2unix
+          sudo apt-get install -y curl bash build-essential libssl-dev pkg-config dos2unix mingw-w64 musl-dev musl-tools dos2unix
           cd ${{ github.workspace }}
           # for whatever reason, for the moment nothing seems to work except an extreme manual approach.
           # this should be corrected later when misterious external errors stop happening
@@ -33,128 +33,135 @@ jobs:
           export PATH=$PATH:$JAVA_HOME/bin
           dos2unix ./gradlew # make sure that gradlew is not with CRLF
           ./gradlew publishModules
-      - name: Cache-out java imodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/imodules
-          key: java-imodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-      - name: Cache-out java emodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/emodules
-          key: java-emodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-  build-scala:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build scala
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y curl bash build-essential libssl-dev pkg-config dos2unix
-          cd ${{ github.workspace }}
           curl -fL "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux-static.gz" | gzip -d > cs
           chmod +x ./cs
           ./cs setup --yes
           sbt publishModules
-      - name: Cache-out scala imodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/imodules
-          key: scala-imodules-${{ github.ref }}
-      - name: Cache-out scala emodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/emodules
-          key: scala-emodules-${{ github.ref }}
-  build-rust:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build rust
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y curl bash build-essential libssl-dev pkg-config mingw-w64 musl-dev musl-tools
-          cd ${{ github.workspace }}
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y 
           source "$HOME/.cargo/env"
           cargo build --release
           cp ./target/release/idesyde-orchestration idesyde
-      - name: Cache-out rust
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/idesyde
-          key: idesyde-${{ github.ref }}
-  test-on-linux:
-    strategy:
-      matrix:
-        jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
-    runs-on: ubuntu-latest
-    needs: [build-java, build-scala, build-rust]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Cache-in java imodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/java-imodules
-          key: java-imodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-          restore-keys: |
-            java-imodules-${{ github.ref }}-
-            java-imodules-
-      - name: Cache-in java emodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/java-emodules
-          key: java-emodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-          restore-keys: |
-            java-emodules-${{ github.ref }}-
-            java-emodules-
-      - name: Cache-in scala imodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/scala-imodules
-          key: scala-imodules-${{ github.ref }}
-          restore-keys: |
-            scala-imodules-
-      - name: Cache-in scala emodules
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/scala-emodules
-          key: scala-emodules-${{ github.ref }}
-          restore-keys: |
-            scala-emodules-
-      - name: Cache-in rust
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/idesyde
-          key: idesyde-${{ github.ref }}
-      - name: Build and Test cases
-        continue-on-error: true
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y curl bash build-essential libssl-dev pkg-config mingw-w64 musl-dev musl-tools dos2unix
-          cd ${{ github.workspace }}
-          mkdir -p imodules
-          mkdir -p emodules
-          cp -r java-imodules/* imodules/
-          cp -r scala-imodules/* imodules/
-          cp -r java-emodules/* emodules/
-          cp -r scala-emodules/* emodules/
           python -m pip install robotframework
           python -m robot --exclude slow TestsBenchmark.robot
-      - name: Upload Robot Log
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-build-log-${{ github.ref }}.html
-          path: log.html
-      - name: Cache-out outputs
-        uses: actions/cache@v3
-        with:
-          enableCrossOsArchive: true
-          path: ${{ github.workspace }}/dist
-          key: dist-${{ github.ref }}-${{ matrix.jabba_jdk }}
+  #     - name: Cache-out java imodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/imodules
+  #         key: java-imodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
+  #     - name: Cache-out java emodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/emodules
+  #         key: java-emodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
+  # build-scala:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Build scala
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y curl bash build-essential libssl-dev pkg-config dos2unix
+  #         cd ${{ github.workspace }}
+
+  #     - name: Cache-out scala imodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/imodules
+  #         key: scala-imodules-${{ github.ref }}
+  #     - name: Cache-out scala emodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/emodules
+  #         key: scala-emodules-${{ github.ref }}
+  # build-rust:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Build rust
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y curl bash build-essential libssl-dev pkg-config mingw-w64 musl-dev musl-tools
+  #         cd ${{ github.workspace }}
+  #         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y 
+  #         source "$HOME/.cargo/env"
+  #         cargo build --release
+  #         cp ./target/release/idesyde-orchestration idesyde
+  #     - name: Cache-out rust
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/idesyde
+  #         key: idesyde-${{ github.ref }}
+  # test-on-linux:
+  #   strategy:
+  #     matrix:
+  #       jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
+  #   runs-on: ubuntu-latest
+  #   needs: [build-java, build-scala, build-rust]
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: actions/setup-python@v4
+  #       with:
+  #         python-version: '3.10'
+  #     - name: Cache-in java imodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/java-imodules
+  #         key: java-imodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
+  #         restore-keys: |
+  #           java-imodules-${{ github.ref }}-
+  #           java-imodules-
+  #     - name: Cache-in java emodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/java-emodules
+  #         key: java-emodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
+  #         restore-keys: |
+  #           java-emodules-${{ github.ref }}-
+  #           java-emodules-
+  #     - name: Cache-in scala imodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/scala-imodules
+  #         key: scala-imodules-${{ github.ref }}
+  #         restore-keys: |
+  #           scala-imodules-
+  #     - name: Cache-in scala emodules
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/scala-emodules
+  #         key: scala-emodules-${{ github.ref }}
+  #         restore-keys: |
+  #           scala-emodules-
+  #     - name: Cache-in rust
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ github.workspace }}/idesyde
+  #         key: idesyde-${{ github.ref }}
+  #     - name: Build and Test cases
+  #       continue-on-error: true
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y curl bash build-essential libssl-dev pkg-config mingw-w64 musl-dev musl-tools dos2unix
+  #         cd ${{ github.workspace }}
+  #         mkdir -p imodules
+  #         mkdir -p emodules
+  #         cp -r java-imodules/* imodules/
+  #         cp -r scala-imodules/* imodules/
+  #         cp -r java-emodules/* emodules/
+  #         cp -r scala-emodules/* emodules/
+  #         python -m pip install robotframework
+  #         python -m robot --exclude slow TestsBenchmark.robot
+  #     - name: Upload Robot Log
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: test-build-log-${{ github.ref }}.html
+  #         path: log.html
+  #     - name: Cache-out outputs
+  #       uses: actions/cache@v3
+  #       with:
+  #         enableCrossOsArchive: true
+  #         path: ${{ github.workspace }}/dist
+  #         key: dist-${{ github.ref }}-${{ matrix.jabba_jdk }}
   # test-cases-linux:
   #   strategy:
   #     matrix:

diff --git a/docs/usage/index.md b/docs/usage/index.md
@@ -488,11 +488,11 @@ but here is some extra information that can be given while maintaining anonymosi
 
 ### SDF applications
 
-Because of the OurMDETools framework, IDeSyDe directly consume [SDF3](https://www.es.ele.tue.nl/sdf3/manuals/xml/sdf/) XML specification files.
+Because of the ForSyDe IO framework, IDeSyDe directly consume [SDF3](https://www.es.ele.tue.nl/sdf3/manuals/xml/sdf/) XML specification files.
 This applies especially to the application graphs. One must be careful when specifying the computational requirements of each actor, since
 the identification rules in IDeSyDe must be able to match them with the computational provisions in the platform decision models available.
 
-SDF applications can also be specified directly as `fiodl` files of the OurMDETools framework, but these are more general than SDF3, so we opt
+SDF applications can also be specified directly as `fiodl` files of the ForSyDe IO framework, but these are more general than SDF3, so we opt
 to use SDF3 files directly for the sake of comprehension.
 
 ### Periodic Workload
@@ -546,7 +546,7 @@ Basically all `fiodl` files contain an example of how the platform is given.
 
 ### KGT files
 
-Because of the OurMDETools framework, `kgt` files of the [KIELER](https://www.rtsys.informatik.uni-kiel.de/en/archive/kieler/welcome-to-the-kieler-project)
+Because of the ForSyDe IO framework, `kgt` files of the [KIELER](https://www.rtsys.informatik.uni-kiel.de/en/archive/kieler/welcome-to-the-kieler-project)
 framework can be generated that enables one to see a bit better the `fiodl` files.
 For the sake of blind-reviewing, the tool which performs this conversion is unfortunately not included in this repository, but some of the demonstrators
 given are the results of the tool.