add fix ownership step back and rearrange build step

CARTAvis · Dec 11, 2023 · 9bda1a0 · 9bda1a0
1 parent 86f300b
commit 9bda1a0
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/.github/workflows/icd_tests_linux.yml b/.github/workflows/icd_tests_linux.yml
@@ -38,6 +38,10 @@ jobs:
         with:
           path: ${{ env.SRC_DIR }}
 
+      - name: Fix ownership
+        run: |
+          chown -R $(id -u):$(id -g) $PWD
+
       - name: Start Docker container for Linux platforms
         if: runner.os == 'Linux'
         id: start_container
@@ -48,23 +52,24 @@ jobs:
           echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
 
       - name: Build backend
-        shell: bash
         run: |
           BUILD_DIR=$GITHUB_WORKSPACE/build-${{ matrix.os_version }}
           mkdir -p $BUILD_DIR
           docker exec -u root -e OS_VERSION=${{ matrix.os_version }} -w $BUILD_DIR $CONTAINER_ID /bin/bash -c "\
-            if [ \"$OS_VERSION\" = 'rhel-7' ]; then
-              source /opt/rh/devtoolset-8/enable
-              gcc --version
-            fi && \
-            git submodule update --init --recursive && \
-            cmake $GITHUB_WORKSPACE/${{ env.SRC_DIR }} \
-              -Dtest=on \
-              -DCMAKE_BUILD_TYPE=Debug \
-              -DDevSuppressExternalWarnings=ON \
-              -DCMAKE_CXX_FLAGS='-O0 -g -fsanitize=address -fno-omit-frame-pointer' \
-              -DCMAKE_EXE_LINKER_FLAGS='-fsanitize=address' && \
-            make -j 16"
+            if [ \"\$OS_VERSION\" = 'rhel-7' ]; then
+               echo 'Source devtoolset for RHEL 7'
+               source /opt/rh/devtoolset-8/enable
+               gcc --version
+            fi"
+          docker exec -u root -w $BUILD_DIR $CONTAINER_ID /bin/bash -c "\
+          git submodule update --init --recursive && \
+          cmake $GITHUB_WORKSPACE/${{ env.SRC_DIR }} \
+            -Dtest=on \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DDevSuppressExternalWarnings=ON \
+            -DCMAKE_CXX_FLAGS='-O0 -g -fsanitize=address -fno-omit-frame-pointer' \
+            -DCMAKE_EXE_LINKER_FLAGS='-fsanitize=address'"
+          docker exec -u root -w $BUILD_DIR $CONTAINER_ID /bin/bash -c "make -j 16"
 
       - name: Check backend runs
         shell: bash