mirror of
https://github.com/gradle/actions
synced 2024-12-04 15:22:20 +00:00
Fix for Windows
Merge branch 'eskatos/fix-windows'
This commit is contained in:
commit
12e24e843d
6 changed files with 6 additions and 18 deletions
7
.github/workflows/dev.yml
vendored
7
.github/workflows/dev.yml
vendored
|
@ -29,10 +29,3 @@ jobs:
|
||||||
gradle-version: 6.5
|
gradle-version: 6.5
|
||||||
build-root-directory: __tests__/data/basic
|
build-root-directory: __tests__/data/basic
|
||||||
arguments: help
|
arguments: help
|
||||||
- name: Check for uncommitted changes
|
|
||||||
# Ensure no changes, but ignore node_modules dir since dev/fresh ci deps installed.
|
|
||||||
run: |
|
|
||||||
git diff --exit-code --stat -- . ':!node_modules' \
|
|
||||||
|| (echo "##[error] found changed files after build. please 'npm run all'" \
|
|
||||||
"and check in all changes" \
|
|
||||||
&& exit 1)
|
|
||||||
|
|
7
.github/workflows/prod.yml
vendored
7
.github/workflows/prod.yml
vendored
|
@ -28,10 +28,3 @@ jobs:
|
||||||
gradle-version: 6.5
|
gradle-version: 6.5
|
||||||
build-root-directory: __tests__/data/basic
|
build-root-directory: __tests__/data/basic
|
||||||
arguments: help
|
arguments: help
|
||||||
- name: Check for uncommitted changes
|
|
||||||
# Ensure no changes, but ignore node_modules dir since dev/fresh ci deps installed.
|
|
||||||
run: |
|
|
||||||
git diff --exit-code --stat -- . ':!node_modules' \
|
|
||||||
|| (echo "##[error] found changed files after build. please 'npm run all'" \
|
|
||||||
"and check in all changes" \
|
|
||||||
&& exit 1)
|
|
||||||
|
|
2
dist/main/index.js
vendored
2
dist/main/index.js
vendored
File diff suppressed because one or more lines are too long
2
dist/post/index.js
vendored
2
dist/post/index.js
vendored
File diff suppressed because one or more lines are too long
|
@ -2,6 +2,7 @@ import * as core from '@actions/core'
|
||||||
import * as cache from '@actions/cache'
|
import * as cache from '@actions/cache'
|
||||||
import * as path from 'path'
|
import * as path from 'path'
|
||||||
import * as fs from 'fs'
|
import * as fs from 'fs'
|
||||||
|
import * as os from 'os'
|
||||||
|
|
||||||
const WRAPPER_CACHE_KEY = 'WRAPPER_CACHE_KEY'
|
const WRAPPER_CACHE_KEY = 'WRAPPER_CACHE_KEY'
|
||||||
const WRAPPER_CACHE_PATH = 'WRAPPER_CACHE_PATH'
|
const WRAPPER_CACHE_PATH = 'WRAPPER_CACHE_PATH'
|
||||||
|
@ -20,7 +21,7 @@ export async function restoreCachedWrapperDist(
|
||||||
|
|
||||||
const wrapperCacheKey = `wrapper-${wrapperSlug}`
|
const wrapperCacheKey = `wrapper-${wrapperSlug}`
|
||||||
const wrapperCachePath = path.join(
|
const wrapperCachePath = path.join(
|
||||||
process.env.HOME!,
|
os.homedir(),
|
||||||
`.gradle/wrapper/dists/gradle-${wrapperSlug}`
|
`.gradle/wrapper/dists/gradle-${wrapperSlug}`
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import * as fs from 'fs'
|
import * as fs from 'fs'
|
||||||
|
import * as os from 'os'
|
||||||
import * as path from 'path'
|
import * as path from 'path'
|
||||||
import * as httpm from 'typed-rest-client/HttpClient'
|
import * as httpm from 'typed-rest-client/HttpClient'
|
||||||
import * as unzip from 'unzipper'
|
import * as unzip from 'unzipper'
|
||||||
|
@ -93,7 +94,7 @@ async function provisionGradle(version: string, url: string): Promise<string> {
|
||||||
return cachedExecutable
|
return cachedExecutable
|
||||||
}
|
}
|
||||||
|
|
||||||
const home = process.env['HOME'] || ''
|
const home = os.homedir()
|
||||||
const tmpdir = path.join(home, 'gradle-provision-tmpdir')
|
const tmpdir = path.join(home, 'gradle-provision-tmpdir')
|
||||||
const downloadsDir = path.join(tmpdir, 'downloads')
|
const downloadsDir = path.join(tmpdir, 'downloads')
|
||||||
const installsDir = path.join(tmpdir, 'installs')
|
const installsDir = path.join(tmpdir, 'installs')
|
||||||
|
|
Loading…
Reference in a new issue