Merge pull request #156 from gradle/test-macos

Fix detection of Gradle User Home on macOS runners
Build outputs
2025-10-21 00:08:55 +08:00 · 2022-02-03 10:08:11 -07:00 · 2022-02-03 09:55:51 -07:00 · 2022-02-03 09:46:37 -07:00 · 2022-02-03 09:11:06 -07:00 · 2022-01-31 14:14:53 -07:00
20 changed files with 1630 additions and 1763 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "@types/node"
--- a/.github/workflows/integTest-action-inputs.yml
+++ b/.github/workflows/integTest-action-inputs.yml
@@ -13,7 +13,7 @@ jobs:
  action-inputs:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-caching-config.yml
+++ b/.github/workflows/integTest-caching-config.yml
@@ -14,7 +14,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -38,7 +38,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -61,7 +61,7 @@ jobs:
  cache-disabled:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -108,7 +108,7 @@ jobs:
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-write-only-
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -127,7 +127,7 @@ jobs:
    needs: seed-build-write-only
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-caching-configuration-cache.yml
+++ b/.github/workflows/integTest-caching-configuration-cache.yml
@@ -17,7 +17,7 @@ jobs:
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -34,7 +34,7 @@ jobs:
    needs: seed-build-groovy
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -56,7 +56,7 @@ jobs:
    needs: seed-build-groovy
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -76,7 +76,7 @@ jobs:
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -93,7 +93,7 @@ jobs:
    needs: seed-build-kotlin
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -111,7 +111,7 @@ jobs:
    needs: modify-build-kotlin
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-caching-gradle-home.yml
+++ b/.github/workflows/integTest-caching-gradle-home.yml
@@ -13,7 +13,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -29,7 +29,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -47,7 +47,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -65,7 +65,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-caching-java-toolchain.yml
+++ b/.github/workflows/integTest-caching-java-toolchain.yml
@@ -13,7 +13,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -29,7 +29,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-execution-with-caching.yml
+++ b/.github/workflows/integTest-execution-with-caching.yml
@@ -13,7 +13,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -29,7 +29,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-execution.yml
+++ b/.github/workflows/integTest-execution.yml
@@ -15,7 +15,7 @@ jobs:
  gradle-execution:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
        include:
          - os: windows-latest
            script-suffix: '.bat'
@@ -46,7 +46,7 @@ jobs:
    strategy:
      matrix:
        gradle: [7.3, 6.9, 5.6.4, 4.10.3]
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
        include:
          - gradle: 5.6.4
            build-root-suffix: -gradle-5
--- a/.github/workflows/integTest-gradle-user-home.yml
+++ b/.github/workflows/integTest-gradle-user-home.yml
@@ -16,7 +16,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -32,7 +32,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -50,7 +50,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-gradle-versions.yml
+++ b/.github/workflows/integTest-gradle-versions.yml
@@ -15,7 +15,7 @@ jobs:
  provision-gradle:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
        include:
          - os: windows-latest
            script-suffix: '.bat'
@@ -49,7 +49,7 @@ jobs:
    strategy:
      matrix:
        gradle: [7.3, 6.9, 5.6.4, 4.10.3]
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
        include:
          - gradle: 5.6.4
            build-root-suffix: -gradle-5
--- a/.github/workflows/integTest-sample-gradle-plugin.yml
+++ b/.github/workflows/integTest-sample-gradle-plugin.yml
@@ -14,7 +14,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -29,7 +29,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/.github/workflows/integTest-sample-kotlin-dsl.yml
+++ b/.github/workflows/integTest-sample-kotlin-dsl.yml
@@ -14,7 +14,7 @@ jobs:
  seed-build:
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
@@ -29,7 +29,7 @@ jobs:
    needs: seed-build
    strategy:
      matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
    - name: Checkout sources
--- a/action.yml
+++ b/action.yml
@@ -68,7 +68,7 @@ outputs:
    description: Link to the build scan if any

 runs:
-  using: 'node12'
+  using: 'node16'
  main: 'dist/main/index.js'
  post: 'dist/post/index.js'

--- a/dist/main/index.js
+++ b/dist/main/index.js
--- a/dist/main/index.js.map
+++ b/dist/main/index.js.map
--- a/dist/post/index.js
+++ b/dist/post/index.js
--- a/dist/post/index.js.map
+++ b/dist/post/index.js.map
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -35,19 +35,19 @@
    "string-argv": "0.3.1"
  },
  "devDependencies": {
-    "@types/jest": "27.0.3",
-    "@types/node": "16.11.11",
-    "@types/unzipper": "0.10.4",
-    "@typescript-eslint/parser": "5.5.0",
+    "@types/jest": "^27.4.0",
+    "@types/node": "^16.11.21",
+    "@types/unzipper": "^0.10.5",
+    "@typescript-eslint/parser": "^5.10.2",
    "@zeit/ncc": "0.22.3",
-    "eslint": "8.3.0",
+    "eslint": "^8.8.0",
    "eslint-plugin-github": "4.3.5",
-    "eslint-plugin-jest": "25.3.0",
-    "jest": "27.4.3",
-    "jest-circus": "27.4.2",
+    "eslint-plugin-jest": "^26.0.0",
+    "jest": "^27.4.7",
+    "jest-circus": "^27.4.6",
    "js-yaml": "4.1.0",
-    "prettier": "2.5.0",
-    "ts-jest": "27.0.7",
-    "typescript": "4.5.2"
+    "prettier": "^2.5.1",
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.5"
  }
 }
--- a/src/cache-base.ts
+++ b/src/cache-base.ts
@@ -102,12 +102,10 @@ export class GradleStateCache {
    }

    cacheOutputExists(): boolean {
-        const paths = this.getCachePath()
-        for (const p of paths) {
-            if (fs.existsSync(p)) {
-                cacheDebug(`Cache output exists at ${p}`)
-                return true
-            }
+        const cachesDir = path.resolve(this.gradleUserHome, 'caches')
+        if (fs.existsSync(cachesDir)) {
+            cacheDebug(`Cache output exists at ${cachesDir}`)
+            return true
        }
        return false
    }
@@ -235,7 +233,7 @@ export class GradleStateCache {

    private initializeGradleUserHome(gradleUserHome: string, initScriptsDir: string): void {
        const propertiesFile = path.resolve(gradleUserHome, 'gradle.properties')
-        fs.writeFileSync(propertiesFile, 'org.gradle.daemon=false')
+        fs.appendFileSync(propertiesFile, 'org.gradle.daemon=false')

        const buildScanCapture = path.resolve(initScriptsDir, 'build-scan-capture.init.gradle')
        fs.writeFileSync(
Author	SHA1	Message	Date
Daz DeBoer	937999e9cc	Merge pull request #156 from gradle/test-macos Fix detection of Gradle User Home on macOS runners	2022-02-03 10:08:11 -07:00
Daz DeBoer	a0998071eb	Build outputs	2022-02-03 09:55:51 -07:00
Daz DeBoer	53e57a851c	Make Gradle Home detection compatible with MacOS MacOS runners are initialized with a Gradle User Home directory including the `~/.gradle/notifications` directory. This was causing the action to skip restoring the Gradle User Home on MacOS. This fix limits the pre-existing GUH check to the `~/.gradle/caches` directory which isn't pre-initialized in the runner. Fixes #155	2022-02-03 09:46:37 -07:00
Daz DeBoer	800e52f373	Run all tests on macos-latest	2022-02-03 09:11:06 -07:00
Daz DeBoer	6dd3b19f8f	Update to @types/node:v16.11.21	2022-01-31 14:14:53 -07:00
Daz DeBoer	6f4fa19a5b	Update to @typescript-eslint/parser@5.10.2	2022-01-31 14:10:03 -07:00
dependabot[bot]	d97141a29c	Bump eslint from 8.7.0 to 8.8.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.7.0 to 8.8.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.7.0...v8.8.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-29 08:27:03 -07:00
Daz DeBoer	bc3340afc5	Tell dependabot to ignore `@types/node`	2022-01-27 09:07:17 -07:00
Daz DeBoer	5f1def5815	Enable dependabot updates	2022-01-27 08:43:59 -07:00
Daz DeBoer	5a7191522f	Merge pull request #144 from gradle/npm-hygiene Perform NPM hygiene	2022-01-27 08:36:38 -07:00
Daz DeBoer	893f0e10c7	Build outputs	2022-01-27 08:23:46 -07:00
Daz DeBoer	d5e58c8a04	Update many NPM dependencies to newer versions	2022-01-27 08:23:14 -07:00
Daz DeBoer	2920a48bbc	Run `npm audit fix` This updates 'node-fetch' to a version without CVE	2022-01-27 08:22:45 -07:00
Daz DeBoer	1904e7e80d	Upgradle to use node v16	2022-01-27 08:22:29 -07:00
Daz DeBoer	702bb97ecb	Do not overwrite existing gradle.properties	2022-01-24 15:18:11 -07:00