From 9218f8f0d4559d7d48a443c89e16ae448986d609 Mon Sep 17 00:00:00 2001
From: Marya <marya.sharf@codeplay.com>
Date: Tue, 9 Jan 2024 22:19:37 +0000
Subject: [PATCH] update

---
 .github/actions/do_build_ock/action.yml       |  2 +-
 .../do_build_ock/do_build_m1/action.yml       |  4 ++
 .../workflows/create_publish_artifacts.yml    | 70 +++++++++----------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/.github/actions/do_build_ock/action.yml b/.github/actions/do_build_ock/action.yml
index ac17e2766..0ea866f81 100644
--- a/.github/actions/do_build_ock/action.yml
+++ b/.github/actions/do_build_ock/action.yml
@@ -104,7 +104,7 @@ runs:
               -DCA_RISCV_ENABLED=${{ inputs.riscv_enabled }}
               -DCA_CL_ENABLE_RVV_SCALABLE_VECZ_CHECK=${{ inputs.enable_rvv_scalable_vecz_check }}
               -DCA_CL_ENABLE_RVV_SCALABLE_VP_VECZ_CHECK=${{ inputs.enable_rvv_scalable_vp_vecz_check }}
-              -DCMAKE_INSTALL_PREFIX=install
+              -DCMAKE_INSTALL_PREFIX=${{ inputs.install_dir }}
                ${{ inputs.extra_flags }}
               .      
     - name: build_ock
diff --git a/.github/actions/do_build_ock/do_build_m1/action.yml b/.github/actions/do_build_ock/do_build_m1/action.yml
index b2ef218d7..8b1385180 100644
--- a/.github/actions/do_build_ock/do_build_m1/action.yml
+++ b/.github/actions/do_build_ock/do_build_m1/action.yml
@@ -5,6 +5,9 @@ inputs:
   build_type:
     description: 'build type (Release, ReleaseAssert)'
     default: ReleaseAssert
+  install_dir:
+    description: 'install directory for OCK'
+    default: install
 
 runs:
   # We don't want a new docker just a list of steps, so mark as composite
@@ -20,3 +23,4 @@ runs:
         riscv_enabled: ON
         enable_rvv_scalable_vecz_check: ON
         enable_rvv_scalable_VP_vecz_check: ON
+        install_dir: ${{ inputs.install_dir }}
diff --git a/.github/workflows/create_publish_artifacts.yml b/.github/workflows/create_publish_artifacts.yml
index 40ee5bed6..64577bc90 100644
--- a/.github/workflows/create_publish_artifacts.yml
+++ b/.github/workflows/create_publish_artifacts.yml
@@ -62,40 +62,40 @@ jobs:
         run: |
           export ONEAPI_ROOT=$(pwd)/linux_nightly_release
           export PATH=$(pwd)/linux_nightly_release/bin:$PATH
-          export LD_LIBRARY_PATH=$(pwd)/linux_nightly_release/lib:$(pwd)/build/lib:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=$(pwd)/linux_nightly_release/lib:$(pwd)/install/lib:$LD_LIBRARY_PATH
 
           $(pwd)/linux_nightly_release/bin/clang++ -fsycl $(pwd)/oneAPI-samples/DirectProgramming/C++SYCL/DenseLinearAlgebra/vector-add/src/vector-add-buffers.cpp -o vect
-          CA_HAL_DEBUG=1 OCL_ICD_FILENAMES=$(pwd)/build/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc  SYCL_CONFIG_FILE_NAME="" ./vect
-
-      # - name: Package Artifacts
-      #   run: |
-      #     tar -czf ock_build.tar.gz $(pwd)/build
-
-      # - name: Upload Artifacts
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: riscv-build
-      #     path: ock_build.tar.gz
-
-      # - name: Compute tag
-      #   id: tag
-      #   run: |
-      #     if [ "${{ github.event_name == 'schedule' }}" == "true" ]; then
-      #       echo "TAG=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-      #     else
-      #       # TODO: Use date of the commit?
-      #       echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
-      #     fi
-
-      # - name: Create OCK pre-release
-      #   uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-      #   with:
-      #     files:
-      #       ock_build.tar.gz
-      #     tag_name: nightly-${{ steps.tag.outputs.TAG }}
-      #     name: OCK daily ${{ steps.tag.outputs.TAG }}
-      #     prerelease: true
-      #     body: "Daily build ${{ steps.tag.outputs.TAG }}"
-      #     target_commitish: ${{ github.sha }}
\ No newline at end of file
+          CA_HAL_DEBUG=1 OCL_ICD_FILENAMES=$(pwd)/install/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc  SYCL_CONFIG_FILE_NAME="" ./vect
+
+      - name: Package Artifacts
+        run: |
+          tar -czf ock_build.tar.gz $(pwd)/build
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: riscv-build
+          path: ock_build.tar.gz
+
+      - name: Compute tag
+        id: tag
+        run: |
+          if [ "${{ github.event_name == 'schedule' }}" == "true" ]; then
+            echo "TAG=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
+          else
+            # TODO: Use date of the commit?
+            echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create OCK pre-release
+        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        with:
+          files:
+            ock_build.tar.gz
+          tag_name: nightly-${{ steps.tag.outputs.TAG }}
+          name: OCK daily ${{ steps.tag.outputs.TAG }}
+          prerelease: true
+          body: "Daily build ${{ steps.tag.outputs.TAG }}"
+          target_commitish: ${{ github.sha }}
\ No newline at end of file