fixing syntax and adjusting linux build folder location

CARTAvis · Dec 6, 2023 · 1e6c0d4 · 1e6c0d4
1 parent 5dea120
commit 1e6c0d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/icd_tests_linux.yml b/.github/workflows/icd_tests_linux.yml
@@ -22,7 +22,7 @@ jobs:
             runner: [self-hosted, linux, Docker, ICD]
             image: ajmasiaa/rhel8-jenkins-apr2022              
     env:
-      SRC_DIR: carta-backend-${{ matrix.os_version }}
+      SRC_DIR: build-${{ matrix.os_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/icd_tests_macos.yml b/.github/workflows/icd_tests_macos.yml
@@ -2,7 +2,7 @@ name: ICD tests macOS
 on:
   push:
   schedule:
-    - cron: '0 0 * * *' # UTC time
+    - cron: '0 0 * * *'
 env:
   ICD_RXJS_BRANCH_NAME: ajm/icd-test-stages-lists
 
@@ -37,24 +37,23 @@ jobs:
           cmake .. -Dtest=on \
                    -DCMAKE_BUILD_TYPE=Debug \
                    -DDevSuppressExternalWarnings=ON \
-                   -DCMAKE_CXX_FLAGS='-O0 -g -fsanitize=address -fno-omit-frame-pointer' \
+                   -DCMAKE_CXX_FLAGS='-O0 -g -fsanitize=address \
+                     -fno-omit-frame-pointer' \
                    -DCMAKE_EXE_LINKER_FLAGS='-fsanitize=address'
                    make -j 16
       - name: Check backend runs
         shell: bash
         run: |
           ./build/carta_backend --version
-
   Prepare-ICD-RxJS:
     name: Prepare-ICD-RxJS ${{ matrix.os_version }}
-    needs: Build
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - os_version: macOS-11
-            runner: macOS-11          
+            runner: macOS-11
           - os_version: macOS-12
             runner: macOS-12
           - os_version: macOS-13
@@ -126,12 +125,12 @@ jobs:
             runner: macOS-13
         os_version: [macOS-11, macOS-12, macOS-13]
     needs: [File-Browser-ICD-Tests, Prepare-ICD-RxJS]
-    if: always()  
+    if: always()
     steps:
       - name: Start carta-backend
         uses: ./.github/actions/start-carta-backend-macos
         with:
-          port: ${{ needs.Prepare-ICD-RxJS.outputs.port }}      
+          port: ${{ needs.Prepare-ICD-RxJS.outputs.port }}
       - name: Animator ICD tests
         run: |
           cd ICD-RxJS
@@ -157,7 +156,7 @@ jobs:
           - os_version: macOS-13
             runner: macOS-13
     needs: [Animator-ICD-Tests, Prepare-ICD-RxJS]
-    if: always()  
+    if: always()
     steps:
       - name: Start carta-backend
         uses: ./.github/actions/start-carta-backend-macos
@@ -359,7 +358,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:  
+        include:
           - os_version: macOS-11
             runner: macOS-11
           - os_version: macOS-12
@@ -389,7 +388,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:  
+        include:
           - os_version: macOS-11
             runner: macOS-11
           - os_version: macOS-12
@@ -419,7 +418,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:  
+        include:
           - os_version: macOS-11
             runner: macOS-11
           - os_version: macOS-12
@@ -502,4 +501,3 @@ jobs:
           done
       - name: Stop carta-backend
         run: kill ${{ env.CARTA_BACKEND_PID }}
-