Merge branch 'main' of github.com:os-fpga/Raptor into bug/EDA-3326/pl…

…l_clk_handling
os-fpga · Nov 18, 2024 · e1f2252 · e1f2252
2 parents 523ca1a + 1f69ad9
commit e1f2252
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/install_ubuntu_dependencies_build.sh b/.github/workflows/install_ubuntu_dependencies_build.sh
@@ -8,6 +8,8 @@ sudo apt-get update -qq
 only_minimum () {
     sudo apt install -y qt6-base-dev qt6-webengine-dev qt6-webengine* libqt6webenginecore6* libegl1-mesa-dev libx11-xcb-dev libxkbcommon-dev 
     sudo apt install -y libhwloc-dev libusb-1.0-0-dev google-perftools clang-tidy-12 valgrind
+    curl -LO http://archive.ubuntu.com/ubuntu/pool/main/libf/libffi/libffi6_3.2.1-8_amd64.deb
+    sudo dpkg -i libffi6_3.2.1-8_amd64.deb
     # for cmake warning, Could NOT find WrapVulkanHeaders, install the Vulkan separately by following the instruction from https://vulkan-tutorial.com/Development_environment#page_Vulkan-Packages
     wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
     sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list http://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
@@ -67,8 +69,6 @@ else
   sudo ln -sf /usr/bin/g++-11 /usr/bin/g++
   sudo ln -sf /usr/bin/gcc-11 /usr/bin/gcc
   sudo ln -sf /usr/bin/gcov-11 /usr/bin/gcov
-  curl -LO http://archive.ubuntu.com/ubuntu/pool/main/libf/libffi/libffi6_3.2.1-8_amd64.deb
-  sudo dpkg -i libffi6_3.2.1-8_amd64.deb
 
   # install Python Packages
   pip3 install orderedmultidict

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -283,6 +283,9 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Checkout Jirs testcase
+      run: git submodule update --init tests/Jira_Testcase
+
     - name: Install dependenices
       uses: ./.github/actions/
       with:
@@ -303,11 +306,12 @@ jobs:
            run_test=`cat TEST_ON`
            export CI=true
            echo $run_test
-           make ${{ matrix.extra-opts}} ${{ matrix.test-type }} $run_test CPU_CORES=2
-           [[ $? != 0 ]] && exit 1
+           make ${{ matrix.extra-opts}} ${{ matrix.test-type }} $run_test CPU_CORES=2 || exit 1
            ls -l /tmp
 
   test-ubuntu-D:
+    # takes too much time so run it on os-fpga Raptor only
+    if: ${{ github.repository == 'os-fpga/Raptor'}} 
     needs: build-Ubuntu-D
     name: ${{ matrix.name }}-${{ matrix.test-type }}
     runs-on: ${{ matrix.os }}
@@ -350,8 +354,7 @@ jobs:
            run_test=`cat TEST_ON`
            export CI=true
            echo $run_test
-           make ${{ matrix.test-type }} ${{ matrix.extra-opts }} $run_test CPU_CORES=2
-           [[ $? != 0 ]] && exit 1
+           make ${{ matrix.test-type }} ${{ matrix.extra-opts }} $run_test CPU_CORES=2 || exit 1
 
   test-ubuntu-P:
     needs: build-Ubuntu-P
@@ -394,8 +397,7 @@ jobs:
            run_test=`cat TEST_ON`
            export CI=true
            echo $run_test
-           make ${{ matrix.test-type }} ${{ matrix.extra-opts }} $run_test CPU_CORES=2
-           [[ $? != 0 ]] && exit 1
+           make ${{ matrix.test-type }} ${{ matrix.extra-opts }} $run_test CPU_CORES=2  || exit 1
 
   test-centos-R:
     needs: build-CentOS-R
@@ -418,6 +420,9 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Checkout Jirs testcase
+      run: git submodule update --init tests/Jira_Testcase
+
     - name: Install dependenices
       uses: ./.github/actions/
       with:
@@ -443,8 +448,7 @@ jobs:
             cd work && tar -xzf build.tar.gz && rm build.tar.gz
             run_test=`cat TEST_ON`
             export CI=true
-            make ${{ matrix.extra-opts}} ${{ matrix.test-type }} $run_test CPU_CORES=2
-            [[ $? != 0 ]] && exit 1
+            make ${{ matrix.extra-opts}} ${{ matrix.test-type }} $run_test CPU_CORES=2  || exit 1
 
   
   Deployment: