fix

pmem · Sep 26, 2024 · b05c1d4 · b05c1d4
1 parent 2f16dbb
commit b05c1d4
Showing 1 changed file with 65 additions and 53 deletions.
diff --git a/.github/workflows/daos_tests.yml b/.github/workflows/daos_tests.yml
@@ -14,76 +14,88 @@ jobs:
     name: DAOS tests
     runs-on: ubuntu-latest
     steps:
-      - name: Clone the DAOS repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          repository: daos-stack/daos
-          ref: release/2.6
-          path: daos
+      # - name: Clone the DAOS repo
+      #   uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      #   with:
+      #     repository: daos-stack/daos
+      #     ref: release/2.6
+      #     path: daos
 
       - name: Clone the PMDK repo
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           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
+      # - 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 = '/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
+      # - 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 = '/opt/daos/'
+      #     GO_BIN = '/usr/local/go/bin/go'
+      #     EOF
+      #     cat ${{ env.OPTS_FILE }}
 
-      - name: Tree /opt/daos/
-        working-directory: /opt/daos/
-        run: |
-          sudo apt-get install tree
-          tree
+      # - name: Build DAOS
+      #   working-directory: daos
+      #   run: |
+      #     git submodule init
+      #     git submodule update
+      #     scons install -j16 --build-deps=yes
 
-      - name: Upload as artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
-        with:
-          name: opt_daos
-          path: /opt/daos/
+      # - name: Tree /opt/daos/
+      #   working-directory: /opt/daos/
+      #   run: |
+      #     sudo apt-get install tree
+      #     tree
+
+      # - name: Upload as artifact
+      #   uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      #   with:
+      #     name: opt_daos
+      #     path: /opt/daos/
 
-      - name: Save as cache
-        uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      # - name: Save as cache
+      #   uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      #   with:
+      #     path: /opt/daos/
+      #     key: opt_daos
+
+      - name: Restore from cache
+        uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: /opt/daos/
           key: opt_daos
+
+      - name: Tree /opt/daos/
+        working-directory: /opt/daos/
+        run: |
+          sudo apt-get install tree
+          tree