Merge branch 'master' into releases/v1

gradle · Jun 14, 2020 · e220e54 · e220e54
2 parents 7200512 + 12e24e8
commit e220e54
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -6,7 +6,10 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v2
@@ -26,10 +29,3 @@ jobs:
         gradle-version: 6.5
         build-root-directory: __tests__/data/basic
         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)
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -9,7 +9,10 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v2
@@ -25,10 +28,3 @@ jobs:
         gradle-version: 6.5
         build-root-directory: __tests__/data/basic
         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)
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/src/cache.ts b/src/cache.ts
@@ -2,6 +2,7 @@ import * as core from '@actions/core'
 import * as cache from '@actions/cache'
 import * as path from 'path'
 import * as fs from 'fs'
+import * as os from 'os'
 
 const WRAPPER_CACHE_KEY = 'WRAPPER_CACHE_KEY'
 const WRAPPER_CACHE_PATH = 'WRAPPER_CACHE_PATH'
@@ -20,7 +21,7 @@ export async function restoreCachedWrapperDist(
 
     const wrapperCacheKey = `wrapper-${wrapperSlug}`
     const wrapperCachePath = path.join(
-        process.env.HOME!,
+        os.homedir(),
         `.gradle/wrapper/dists/gradle-${wrapperSlug}`
     )
 

diff --git a/src/provision.ts b/src/provision.ts
@@ -1,4 +1,5 @@
 import * as fs from 'fs'
+import * as os from 'os'
 import * as path from 'path'
 import * as httpm from 'typed-rest-client/HttpClient'
 import * as unzip from 'unzipper'
@@ -93,7 +94,7 @@ async function provisionGradle(version: string, url: string): Promise<string> {
         return cachedExecutable
     }
 
-    const home = process.env['HOME'] || ''
+    const home = os.homedir()
     const tmpdir = path.join(home, 'gradle-provision-tmpdir')
     const downloadsDir = path.join(tmpdir, 'downloads')
     const installsDir = path.join(tmpdir, 'installs')