Ubuntu and MacOs should be able to use the same Conda env yml

riscv-software-src · May 31, 2024 · 936dd41 · 936dd41
1 parent da711eb
commit 936dd41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 160 deletions.
diff --git a/.github/workflows/conda/macos_env.yml b/.github/workflows/conda/macos_env.yml
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Cache conda deps
         uses: actions/cache@v3
         with:
-          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('.github/workflows/conda/macos_env.yml') }}
+          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('conda/environment.yml') }}
           path: /usr/share/miniconda/envs/riscv_perf_model # Default path for conda
 
       # Setup CCache to cache builds
@@ -66,7 +66,7 @@ jobs:
         run: |
           # $CONDA is an environment variable pointing to the root of the miniconda directory
           $CONDA/bin/conda config --set channel_priority strict
-          $CONDA/bin/conda env update --file  ${{ github.workspace }}/.github/workflows/conda/macos_env.yml
+          $CONDA/bin/conda env update --file  ${{ github.workspace }}/conda/environment.yml
           $CONDA/bin/conda init bash
 
       # Build