fix

pmem · Sep 26, 2024 · 4ab37e6 · 4ab37e6
1 parent b944e5a
commit 4ab37e6
Showing 1 changed file with 35 additions and 35 deletions.
diff --git a/.github/workflows/daos_tests.yml b/.github/workflows/daos_tests.yml
@@ -30,60 +30,60 @@ jobs:
           repository: pmem/pmdk
           path: pmdk
 
-      # - name: Apply DAOS patches
-      #   working-directory: daos
-      #   run: git apply ../pmdk/src/test/daos_dtx/*.patch
+      - name: Apply DAOS patches
+        working-directory: daos
+        run: git apply ../pmdk/src/test/daos_dtx/*.patch
 
       - name: Install DAOS dependencies
         working-directory: daos
         run: |
           sudo pip install -r requirements-build.txt
           sudo utils/scripts/install-ubuntu.sh
 
-      # # https://go.dev/doc/install
-      # - name: Update the golang package
-      #   env:
-      #     GOLANG_VER: go1.23.1 # >= 1.21 because of https://go.dev/doc/toolchain
-      #   run: |
-      #     sudo apt-get remove golang-go
-      #     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
+      # https://go.dev/doc/install
+      - name: Update the golang package
+        env:
+          GOLANG_VER: go1.23.1 # >= 1.21 because of https://go.dev/doc/toolchain
+        run: |
+          sudo apt-get remove golang-go
+          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: 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: |
-      #     cat <<-EOF >> ${{ env.OPTS_FILE }}
-      #     BUILD_TYPE = 'debug'
-      #     TARGET_TYPE = 'debug'
-      #     PREFIX = '${{ env.DAOS_PATH }}'
-      #     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
+      - name: Generate ${{ env.OPTS_FILE }}
+        working-directory: daos
+        env:
+          OPTS_FILE: daos.conf
+        run: |
+          cat <<-EOF >> ${{ env.OPTS_FILE }}
+          BUILD_TYPE = 'debug'
+          TARGET_TYPE = 'debug'
+          PREFIX = '${{ env.DAOS_PATH }}'
+          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
 
       # - name: Tree ${{ env.DAOS_PATH }}
       #   working-directory: ${{ env.DAOS_PATH }}
       #   run: |
       #     sudo apt-get install tree
       #     tree
 
-      - name: Restore ${{ env.DAOS_PATH }} from cache
-        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
-        with:
-          path: ${{ env.DAOS_PATH }}
-          key: opt_daos
+      # - name: Restore ${{ env.DAOS_PATH }} from cache
+      #   uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      #   with:
+      #     path: ${{ env.DAOS_PATH }}
+      #     key: opt_daos
 
       # - name: Upload ${{ env.DAOS_PATH }} as artifact
       #   uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0