Don't post to the download cache when environment caching (#53)

mamba-org · May 12, 2022 · d7eeccc · d7eeccc
1 parent 18d8ee1
commit d7eeccc
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git a/.github/workflows/test_caching.yml b/.github/workflows/test_caching.yml
@@ -25,6 +25,7 @@ jobs:
         uses: ./
         with:
           cache-downloads: true
+          cache-downloads-key: download-downloadkey-${{ github.sha }}-${{ github.run_attempt }}
 
       - name: test environment name
         run: |
@@ -45,6 +46,7 @@ jobs:
         uses: ./
         with:
           cache-downloads: true
+          cache-downloads-key: download-downloadkey-${{ github.sha }}-${{ github.run_attempt }}
 
       - name: test environment name
         run: |
@@ -64,6 +66,7 @@ jobs:
         uses: ./
         with:
           cache-env: true
+          cache-env-key: env-envkey-${{ github.sha }}-${{ github.run_attempt }}
 
       - name: test environment name
         run: |
@@ -84,6 +87,7 @@ jobs:
         uses: ./
         with:
           cache-env: true
+          cache-env-key: env-envkey-${{ github.sha }}-${{ github.run_attempt }}
 
       - name: test environment name
         run: |
@@ -106,6 +110,52 @@ jobs:
         with:
           cache-env: true
           cache-env-always-update: true
+          cache-env-key: env-envkey-${{ github.sha }}-${{ github.run_attempt }}
+
+      - name: test environment name
+        run: |
+          python -c "import os; env = os.path.basename(os.environ['CONDA_PREFIX']); assert env == 'testenv'"
+
+  test_download_and_env1:
+    name: Test download+env cache 1/2
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: install mamba
+        uses: ./
+        with:
+          cache-downloads: true
+          cache-env: true
+          cache-downloads-key: download-env-downloadkey-${{ github.sha }}-${{ github.run_attempt }}
+          cache-env-key: download-env-envkey-${{ github.sha }}-${{ github.run_attempt }}
+
+      - name: test environment name
+        run: |
+          python -c "import os; env = os.path.basename(os.environ['CONDA_PREFIX']); assert env == 'testenv'"
+
+  test_download_and_env2:
+    name: Test download+env cache 2/2
+    needs: [test_download_and_env1]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: install mamba
+        uses: ./
+        with:
+          cache-downloads: true
+          cache-env: true
+          cache-downloads-key: download-env-downloadkey-${{ github.sha }}-${{ github.run_attempt }}
+          cache-env-key: download-env-envkey-${{ github.sha }}-${{ github.run_attempt }}
 
       - name: test environment name
         run: |

diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/index.js b/index.js
@@ -304,7 +304,8 @@ channel_priority: strict
       envCacheHit = await tryRestoreCache(...envCacheArgs)
     }
 
-    if (!envCacheHit || inputs.cacheEnvAlwaysUpdate) {
+    const shouldTryDownloadCache = !envCacheHit || inputs.cacheEnvAlwaysUpdate
+    if (shouldTryDownloadCache) {
       // Try to restore the download cache.
       if (inputs.cacheDownloads) {
         const key = inputs.cacheDownloadsKey || `${MAMBA_PLATFORM}-${process.arch} ${today()}`
@@ -335,7 +336,7 @@ Write-Host "Profile already exists and new content added"
     core.info(`Contents of ${PATHS.bashprofile}:\n${fs.readFileSync(PATHS.bashprofile)}`)
 
     // Save cache on workflow success
-    if (inputs.cacheDownloads && !downloadCacheHit) {
+    if (shouldTryDownloadCache && inputs.cacheDownloads && !downloadCacheHit) {
       saveCacheOnPost(...downloadCacheArgs)
     }
     if (inputs.cacheEnv && !envCacheHit) {