updated github workflows

mochi-hpc · Dec 13, 2024 · 463d5a3 · 463d5a3
1 parent 6120999
commit 463d5a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -11,6 +11,6 @@ jobs:
     name: Build the main version of the package
     steps:
     - uses: actions/checkout@v4
-    - uses: mochi-hpc/mochi-test-build-action@v1
+    - uses: mochi-hpc/mochi-test-build-action@v2
       with:
         package-version: "@develop"
diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
@@ -11,6 +11,7 @@ jobs:
     name: Build the latest version of the package
     steps:
     - uses: actions/checkout@v4
-    - uses: mochi-hpc/mochi-test-build-action@v1
+    - uses: mochi-hpc/mochi-test-build-action@v2
       with:
         build-cache-token: ${{ secrets.GITHUB_TOKEN }}
+        push-only-dependencies: false
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -11,7 +11,7 @@ jobs:
     name: Build the main version of the package
     steps:
     - uses: actions/checkout@v4
-    - uses: mochi-hpc/mochi-test-build-action@v1
+    - uses: mochi-hpc/mochi-test-build-action@v2
       with:
         package-version: "@main"
         build-cache-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,17 +23,16 @@ jobs:
       with:
         ref: develop
 
+    - name: Set install root for Spack
+      run: |
+        spack -e tests config add config:install_tree:root:/opt/spack
+        spack -e tests config add view:/opt/view
+
     - name: Add mochi-spack-packages
       run: |
         git clone https://github.com/mochi-hpc/mochi-spack-packages
         spack -e tests repo add mochi-spack-packages
 
-    - name: Setup credentials for buildcache
-      run: |
-        spack -e tests mirror set --autopush --push \
-        --oci-username ${{ github.actor }} \
-        --oci-password "${{ secrets.GITHUB_TOKEN }}" mochi-buildcache
-
     - name: Install spack environment
       run: |
         spack -e tests install
@@ -60,5 +59,9 @@ jobs:
     - name: Push packages to buildcache and update index
       if: ${{ !cancelled() }}
       run: |
+        export GUTHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+        spack -e tests mirror set --autopush --push \
+        --oci-username ${{ github.actor }} \
+        --oci-password-variable GITHUB_TOKEN mochi-buildcache
         spack -e tests buildcache push --base-image ubuntu:22.04 \
         --unsigned --update-index mochi-buildcache