File tree Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ function get_slim() {
94
94
const_1 . core . notice ( `slim ${ VER } found in cache` ) ;
95
95
}
96
96
else {
97
- slimPath = const_1 . path . join ( process . env . GITHUB_WORKSPACE , '../' , 'slim ') ;
97
+ const parentWorkspace = const_1 . path . join ( process . env . GITHUB_WORKSPACE , '../' ) ;
98
98
let srcPath ;
99
99
try {
100
100
const_1 . core . debug ( `Downloading slim ${ VER } for ${ KERNEL } /${ MACHINE } ...` ) ;
@@ -107,15 +107,16 @@ function get_slim() {
107
107
try {
108
108
const_1 . core . debug ( `Extracting slim ${ VER } ...` ) ;
109
109
if ( EXT === 'zip' ) {
110
- extractedPath = yield const_1 . tc . extractZip ( srcPath , slimPath ) ;
110
+ extractedPath = yield const_1 . tc . extractZip ( srcPath , parentWorkspace ) ;
111
111
}
112
112
else { // tar.gz
113
- extractedPath = yield const_1 . tc . extractTar ( srcPath , slimPath ) ;
113
+ extractedPath = yield const_1 . tc . extractTar ( srcPath , parentWorkspace ) ;
114
114
}
115
115
}
116
116
catch ( error ) {
117
117
throw new Error ( `Could not extract slim: ${ error . message } ` ) ;
118
118
}
119
+ extractedPath = const_1 . path . join ( extractedPath , DIST ) ;
119
120
const_1 . core . debug ( 'Caching slim...' ) ;
120
121
slimPath = yield const_1 . tc . cacheDir ( extractedPath , 'slim' , VER , MACHINE ) ;
121
122
}
Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ async function get_slim() {
88
88
if ( slimPath ) {
89
89
core . notice ( `slim ${ VER } found in cache` )
90
90
} else {
91
- slimPath = path . join ( process . env . GITHUB_WORKSPACE , '../' , 'slim ')
91
+ const parentWorkspace = path . join ( process . env . GITHUB_WORKSPACE , '../' )
92
92
93
93
let srcPath
94
94
try {
@@ -102,13 +102,14 @@ async function get_slim() {
102
102
try {
103
103
core . debug ( `Extracting slim ${ VER } ...` )
104
104
if ( EXT === 'zip' ) {
105
- extractedPath = await tc . extractZip ( srcPath , slimPath )
105
+ extractedPath = await tc . extractZip ( srcPath , parentWorkspace )
106
106
} else { // tar.gz
107
- extractedPath = await tc . extractTar ( srcPath , slimPath )
107
+ extractedPath = await tc . extractTar ( srcPath , parentWorkspace )
108
108
}
109
109
} catch ( error ) {
110
110
throw new Error ( `Could not extract slim: ${ error . message } ` )
111
111
}
112
+ extractedPath = path . join ( extractedPath , DIST )
112
113
113
114
core . debug ( 'Caching slim...' )
114
115
slimPath = await tc . cacheDir ( extractedPath , 'slim' , VER , MACHINE )
You can’t perform that action at this time.
0 commit comments