fix

pmem · Sep 25, 2024 · bef0217 · bef0217
1 parent fa284b2
commit bef0217
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/.github/workflows/daos_tests.yml b/.github/workflows/daos_tests.yml
@@ -29,10 +29,9 @@ jobs:
 
       - name: Apply DAOS patches
         working-directory: daos
-        run: |
-          git apply ../pmdk/src/test/daos_dtx/*.patch
+        run: git apply ../pmdk/src/test/daos_dtx/*.patch
 
-      - name: Install dependencies
+      - name: Install DAOS dependencies
         working-directory: daos
         run: |
           sudo pip install -r requirements-build.txt
@@ -47,24 +46,26 @@ jobs:
           wget https://go.dev/dl/${{ env.GOLANG_VER }}.linux-amd64.tar.gz
           sudo tar -C /usr/local -xzf ${{ env.GOLANG_VER }}.linux-amd64.tar.gz
 
-      - name: Build DAOS
+      - name: Install Valgrind
+        working-directory: pmdk/utils/docker/images/
+        run: sudo install-valgrind.sh
+
+      - name: Generate ${{ env.OPTS_FILE }}
         working-directory: daos
         env:
           OPTS_FILE: daos.conf
         run: |
-          export PATH=$PATH:/usr/local/go/bin
-          git submodule init
-          git submodule update
           cat <<-EOF >> ${{ env.OPTS_FILE }}
           BUILD_TYPE = 'debug'
           TARGET_TYPE = 'debug'
           PREFIX = '/opt/daos/'
           GO_BIN = '/usr/local/go/bin/go'
           EOF
           cat ${{ env.OPTS_FILE }}
+
+      - name: Build DAOS
+        working-directory: daos
+        run: |
+          git submodule init
+          git submodule update
           scons install -j16 --build-deps=yes
-          
-        # echo 'BUILD_TYPE=debug'             >> 
-        # echo 'TARGET_TYPE=debug'            >> ${{ env.OPTS_FILE }}
-        # echo 'PREFIX=/opt/daos/'            >> ${{ env.OPTS_FILE }}
-        # echo 'GO_BIN=/usr/local/go/bin/go'  >> ${{ env.OPTS_FILE }}