Backup config.toml before workflow

src/download/download-version.ts

@@ -1,6 +1,5 @@
 import * as core from '@actions/core'
 import * as tc from '@actions/tool-cache'
-import * as io from '@actions/io'
 import {
   Architecture,
   OWNER,
@@ -9,7 +8,6 @@ import {
   toolsCacheName,
   validateChecksum
 } from '../utils'
-import {ryeHomePath} from '../restore-cache'
 
 export function tryGetFromCache(
   arch: Architecture,
@@ -18,15 +16,7 @@ export function tryGetFromCache(
   core.debug(`Trying to get Rye from cache for ${version}...`)
   const cachedVersions = tc.findAllVersions(toolsCacheName, arch)
   core.debug(`Cached versions: ${cachedVersions}`)
-  const foundPath = tc.find(toolsCacheName, version, arch)
-  if (foundPath) {
-    core.info(`Found Rye in cache for ${version}`)
-    io.cp(foundPath, ryeHomePath, {
-      copySourceDirectory: true,
-      recursive: true
-    })
-    return ryeHomePath
-  }
+  return tc.find(toolsCacheName, version, arch)
 }
 
 export async function downloadVersion(

src/restore-cache.ts

@@ -4,16 +4,14 @@ import * as glob from '@actions/glob'
 import * as core from '@actions/core'
 import {cp} from '@actions/io/'
 import {exists} from '@actions/io/lib/io-util'
-import {resolve} from 'path'
 import {getArch} from './utils'
 
 export const STATE_CACHE_KEY = 'cache-key'
 export const STATE_CACHE_MATCHED_KEY = 'cache-matched-key'
 export const workingDirInput = core.getInput('working-directory')
 export const workingDir = workingDirInput ? `/${workingDirInput}` : ''
 export const venvPath = `${process.env['GITHUB_WORKSPACE']}${workingDir}/.venv`
-export const ryeHomePath = resolve(`${process.env['GITHUB_WORKSPACE']}/../.rye`)
-const CACHE_VERSION = '4'
+const CACHE_VERSION = '5'
 const cacheLocalStoragePath =
   `${core.getInput('cache-local-storage-path')}` || ''
 const cacheDependencyPath = `${process.env['GITHUB_WORKSPACE']}${workingDir}/requirements**.lock`

src/save-cache.ts

@@ -1,12 +1,17 @@
 import * as cache from '@actions/cache'
 import * as core from '@actions/core'
-import {mkdirP, cp, rmRF} from '@actions/io/'
+import * as io from '@actions/io/'
+import * as fs from 'fs'
 import {
   STATE_CACHE_MATCHED_KEY,
   STATE_CACHE_KEY,
-  venvPath,
-  ryeHomePath
+  venvPath
 } from './restore-cache'
+import {
+  RYE_CONFIG_TOML,
+  RYE_CONFIG_TOML_BACKUP,
+  STATE_TOOL_CACHED_PATH
+} from './utils'
 
 const enableCache = core.getInput('enable-cache') === 'true'
 const cacheLocalStoragePath =
@@ -21,8 +26,15 @@ export async function run(): Promise<void> {
     const err = error as Error
     core.setFailed(err.message)
   }
-  rmRF(ryeHomePath)
-  core.info(`Cleaned up RYE_HOME: ${ryeHomePath}`)
+  const cachedPath = core.getState(STATE_TOOL_CACHED_PATH)
+  await io.rmRF(`${cachedPath}/${RYE_CONFIG_TOML}`)
+  if (fs.existsSync(`${cachedPath}/${RYE_CONFIG_TOML}`)) {
+    await io.mv(
+      `${cachedPath}/${RYE_CONFIG_TOML_BACKUP}`,
+      `${cachedPath}/${RYE_CONFIG_TOML}`
+    )
+    core.info(`Restored ${cachedPath}/${RYE_CONFIG_TOML}`)
+  }
 }
 
 async function saveCache(): Promise<void> {
@@ -47,8 +59,8 @@ async function saveCache(): Promise<void> {
 
 async function saveCacheLocal(cacheKey: string): Promise<void> {
   const targetPath = `${cacheLocalStoragePath}/${cacheKey}`
-  await mkdirP(targetPath)
-  await cp(venvPath, `${targetPath}/.venv`, {
+  await io.mkdirP(targetPath)
+  await io.cp(venvPath, `${targetPath}/.venv`, {
     recursive: true
   })
 }