Skip to content

Commit b55d64c

Browse files
committed
Set up ASDF explicitly when installing tools asdf-vm#235
Before, this was implicitly done by pluginsAdd but we now need it before installing plugins to get the current asdf version for the cache-key
1 parent 0638e38 commit b55d64c

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

install/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66937,6 +66937,7 @@ async function restoreAsdfCache() {
6693766937
return cache.restoreCache(paths, cacheKey, restoreKeys);
6693866938
}
6693966939
async function toolsInstall() {
66940+
await setupAsdf();
6694066941
if (await restoreAsdfCache()) {
6694166942
core3.info("Cache restored, skipping asdf install");
6694266943
return;

src/install/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as core from '@actions/core';
55
import * as exec from '@actions/exec';
66
import * as cache from '@actions/cache';
77
import {pluginsAdd} from '~/plugins-add/index.ts';
8+
import {setupAsdf} from '~/setup/index.ts';
89

910
async function restoreAsdfCache() {
1011
/* eslint-disable-next-line no-warning-comments */
@@ -42,6 +43,8 @@ async function restoreAsdfCache() {
4243
}
4344

4445
async function toolsInstall(): Promise<void> {
46+
await setupAsdf();
47+
4548
if (await restoreAsdfCache()) {
4649
core.info('Cache restored, skipping asdf install');
4750
return;

0 commit comments

Comments
 (0)