From 5e522253a6690c610532da74a2fb7db69c507ea7 Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 25 Jan 2024 11:18:18 -0700 Subject: [PATCH] Combine all sources into a sub-directory --- .eslintignore => sources/.eslintignore | 0 .eslintrc.json => sources/.eslintrc.json | 0 .nvmrc => sources/.nvmrc | 0 .prettierignore => sources/.prettierignore | 0 .prettierrc.json => sources/.prettierrc.json | 0 .tool-versions => sources/.tool-versions | 0 jest.config.js => sources/jest.config.js | 0 package-lock.json => sources/package-lock.json | 0 package.json => sources/package.json | 4 ++-- .../patches}/@actions+cache+3.2.3.patch | 0 .../patches}/@azure+logger+1.0.4.patch | 0 {src => sources/src}/build-results.ts | 0 {src => sources/src}/build-scan.ts | 0 {src => sources/src}/cache-base.ts | 2 +- {src => sources/src}/cache-cleaner.ts | 0 {src => sources/src}/cache-extract-entries.ts | 0 {src => sources/src}/cache-reporting.ts | 0 {src => sources/src}/cache-utils.ts | 0 {src => sources/src}/caches.ts | 0 {src => sources/src}/daemon-controller.ts | 0 {src => sources/src}/dependency-graph.ts | 0 {src => sources/src}/errors.ts | 0 {src => sources/src}/execution.ts | 0 {src => sources/src}/gradlew.ts | 0 {src => sources/src}/input-params.ts | 0 {src => sources/src}/job-summary.ts | 0 {src => sources/src}/main.ts | 0 {src => sources/src}/post.ts | 0 {src => sources/src}/provision.ts | 0 {src => sources/src}/repository-layout.ts | 0 ...ction.build-result-capture-service.plugin.groovy | 0 ...le-build-action.build-result-capture.init.gradle | 0 ...thub-dependency-graph-gradle-plugin-apply.groovy | 0 ...build-action.github-dependency-graph.init.gradle | 0 ...radle-build-action.inject-develocity.init.gradle | 0 {src => sources/src}/resources/toolchains.xml | 0 {src => sources/src}/setup-gradle.ts | 0 {test => sources/test}/init-scripts/.gitignore | 0 {test => sources/test}/init-scripts/build.gradle | 0 .../init-scripts/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {test => sources/test}/init-scripts/gradlew | 0 {test => sources/test}/init-scripts/gradlew.bat | 0 {test => sources/test}/init-scripts/settings.gradle | 0 .../gradlebuildaction/BaseInitScriptTest.groovy | 0 .../TestBuildResultRecorder.groovy | 0 .../gradlebuildaction/TestDependencyGraph.groovy | 0 .../TestDevelocityInjection.groovy | 0 {test => sources/test}/jest/cache-cleanup.test.ts | 0 {test => sources/test}/jest/cache-reporting.test.ts | 0 {test => sources/test}/jest/cache-utils.test.ts | 0 .../test}/jest/dependency-graph.test.ts | 0 {test => sources/test}/jest/input-params.test.ts | 0 .../jest/resources/cache-cleanup/.gitattributes | 0 .../test}/jest/resources/cache-cleanup/.gitignore | 0 .../test}/jest/resources/cache-cleanup/build.gradle | 0 .../cache-cleanup/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../test}/jest/resources/cache-cleanup/gradlew | 0 .../test}/jest/resources/cache-cleanup/gradlew.bat | 0 .../jest/resources/cache-cleanup/settings.gradle | 0 .../src/main/java/unused/dependencies/Library.java | 0 tsconfig.json => sources/tsconfig.json | 0 63 files changed, 3 insertions(+), 3 deletions(-) rename .eslintignore => sources/.eslintignore (100%) rename .eslintrc.json => sources/.eslintrc.json (100%) rename .nvmrc => sources/.nvmrc (100%) rename .prettierignore => sources/.prettierignore (100%) rename .prettierrc.json => sources/.prettierrc.json (100%) rename .tool-versions => sources/.tool-versions (100%) rename jest.config.js => sources/jest.config.js (100%) rename package-lock.json => sources/package-lock.json (100%) rename package.json => sources/package.json (88%) rename {patches => sources/patches}/@actions+cache+3.2.3.patch (100%) rename {patches => sources/patches}/@azure+logger+1.0.4.patch (100%) rename {src => sources/src}/build-results.ts (100%) rename {src => sources/src}/build-scan.ts (100%) rename {src => sources/src}/cache-base.ts (99%) rename {src => sources/src}/cache-cleaner.ts (100%) rename {src => sources/src}/cache-extract-entries.ts (100%) rename {src => sources/src}/cache-reporting.ts (100%) rename {src => sources/src}/cache-utils.ts (100%) rename {src => sources/src}/caches.ts (100%) rename {src => sources/src}/daemon-controller.ts (100%) rename {src => sources/src}/dependency-graph.ts (100%) rename {src => sources/src}/errors.ts (100%) rename {src => sources/src}/execution.ts (100%) rename {src => sources/src}/gradlew.ts (100%) rename {src => sources/src}/input-params.ts (100%) rename {src => sources/src}/job-summary.ts (100%) rename {src => sources/src}/main.ts (100%) rename {src => sources/src}/post.ts (100%) rename {src => sources/src}/provision.ts (100%) rename {src => sources/src}/repository-layout.ts (100%) rename {src => sources/src}/resources/init-scripts/gradle-build-action.build-result-capture-service.plugin.groovy (100%) rename {src => sources/src}/resources/init-scripts/gradle-build-action.build-result-capture.init.gradle (100%) rename {src => sources/src}/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy (100%) rename {src => sources/src}/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle (100%) rename {src => sources/src}/resources/init-scripts/gradle-build-action.inject-develocity.init.gradle (100%) rename {src => sources/src}/resources/toolchains.xml (100%) rename {src => sources/src}/setup-gradle.ts (100%) rename {test => sources/test}/init-scripts/.gitignore (100%) rename {test => sources/test}/init-scripts/build.gradle (100%) rename {test => sources/test}/init-scripts/gradle/wrapper/gradle-wrapper.jar (100%) rename {test => sources/test}/init-scripts/gradle/wrapper/gradle-wrapper.properties (100%) rename {test => sources/test}/init-scripts/gradlew (100%) rename {test => sources/test}/init-scripts/gradlew.bat (100%) rename {test => sources/test}/init-scripts/settings.gradle (100%) rename {test => sources/test}/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy (100%) rename {test => sources/test}/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy (100%) rename {test => sources/test}/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy (100%) rename {test => sources/test}/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy (100%) rename {test => sources/test}/jest/cache-cleanup.test.ts (100%) rename {test => sources/test}/jest/cache-reporting.test.ts (100%) rename {test => sources/test}/jest/cache-utils.test.ts (100%) rename {test => sources/test}/jest/dependency-graph.test.ts (100%) rename {test => sources/test}/jest/input-params.test.ts (100%) rename {test => sources/test}/jest/resources/cache-cleanup/.gitattributes (100%) rename {test => sources/test}/jest/resources/cache-cleanup/.gitignore (100%) rename {test => sources/test}/jest/resources/cache-cleanup/build.gradle (100%) rename {test => sources/test}/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar (100%) rename {test => sources/test}/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties (100%) rename {test => sources/test}/jest/resources/cache-cleanup/gradlew (100%) rename {test => sources/test}/jest/resources/cache-cleanup/gradlew.bat (100%) rename {test => sources/test}/jest/resources/cache-cleanup/settings.gradle (100%) rename {test => sources/test}/jest/resources/cache-cleanup/src/main/java/unused/dependencies/Library.java (100%) rename tsconfig.json => sources/tsconfig.json (100%) diff --git a/.eslintignore b/sources/.eslintignore similarity index 100% rename from .eslintignore rename to sources/.eslintignore diff --git a/.eslintrc.json b/sources/.eslintrc.json similarity index 100% rename from .eslintrc.json rename to sources/.eslintrc.json diff --git a/.nvmrc b/sources/.nvmrc similarity index 100% rename from .nvmrc rename to sources/.nvmrc diff --git a/.prettierignore b/sources/.prettierignore similarity index 100% rename from .prettierignore rename to sources/.prettierignore diff --git a/.prettierrc.json b/sources/.prettierrc.json similarity index 100% rename from .prettierrc.json rename to sources/.prettierrc.json diff --git a/.tool-versions b/sources/.tool-versions similarity index 100% rename from .tool-versions rename to sources/.tool-versions diff --git a/jest.config.js b/sources/jest.config.js similarity index 100% rename from jest.config.js rename to sources/jest.config.js diff --git a/package-lock.json b/sources/package-lock.json similarity index 100% rename from package-lock.json rename to sources/package-lock.json diff --git a/package.json b/sources/package.json similarity index 88% rename from package.json rename to sources/package.json index 0255fbc..88e5463 100644 --- a/package.json +++ b/sources/package.json @@ -8,8 +8,8 @@ "format": "prettier --write **/*.ts", "format-check": "prettier --check **/*.ts", "lint": "eslint src/**/*.ts", - "compile-main": "ncc build src/main.ts --out dist/main --source-map --no-source-map-register", - "compile-post": "ncc build src/post.ts --out dist/post --source-map --no-source-map-register", + "compile-main": "ncc build src/main.ts --out ../dist/main --source-map --no-source-map-register", + "compile-post": "ncc build src/post.ts --out ../dist/post --source-map --no-source-map-register", "compile": "npm-run-all --parallel compile-*", "check": "npm-run-all --parallel format lint", "test": "jest", diff --git a/patches/@actions+cache+3.2.3.patch b/sources/patches/@actions+cache+3.2.3.patch similarity index 100% rename from patches/@actions+cache+3.2.3.patch rename to sources/patches/@actions+cache+3.2.3.patch diff --git a/patches/@azure+logger+1.0.4.patch b/sources/patches/@azure+logger+1.0.4.patch similarity index 100% rename from patches/@azure+logger+1.0.4.patch rename to sources/patches/@azure+logger+1.0.4.patch diff --git a/src/build-results.ts b/sources/src/build-results.ts similarity index 100% rename from src/build-results.ts rename to sources/src/build-results.ts diff --git a/src/build-scan.ts b/sources/src/build-scan.ts similarity index 100% rename from src/build-scan.ts rename to sources/src/build-scan.ts diff --git a/src/cache-base.ts b/sources/src/cache-base.ts similarity index 99% rename from src/cache-base.ts rename to sources/src/cache-base.ts index a97835a..b4a2dea 100644 --- a/src/cache-base.ts +++ b/sources/src/cache-base.ts @@ -235,7 +235,7 @@ export class GradleStateCache { private readResourceFileAsString(...paths: string[]): string { // Resolving relative to __dirname will allow node to find the resource at runtime - const absolutePath = path.resolve(__dirname, '..', '..', 'src', 'resources', ...paths) + const absolutePath = path.resolve(__dirname, '..', '..', 'sources', 'src', 'resources', ...paths) return fs.readFileSync(absolutePath, 'utf8') } diff --git a/src/cache-cleaner.ts b/sources/src/cache-cleaner.ts similarity index 100% rename from src/cache-cleaner.ts rename to sources/src/cache-cleaner.ts diff --git a/src/cache-extract-entries.ts b/sources/src/cache-extract-entries.ts similarity index 100% rename from src/cache-extract-entries.ts rename to sources/src/cache-extract-entries.ts diff --git a/src/cache-reporting.ts b/sources/src/cache-reporting.ts similarity index 100% rename from src/cache-reporting.ts rename to sources/src/cache-reporting.ts diff --git a/src/cache-utils.ts b/sources/src/cache-utils.ts similarity index 100% rename from src/cache-utils.ts rename to sources/src/cache-utils.ts diff --git a/src/caches.ts b/sources/src/caches.ts similarity index 100% rename from src/caches.ts rename to sources/src/caches.ts diff --git a/src/daemon-controller.ts b/sources/src/daemon-controller.ts similarity index 100% rename from src/daemon-controller.ts rename to sources/src/daemon-controller.ts diff --git a/src/dependency-graph.ts b/sources/src/dependency-graph.ts similarity index 100% rename from src/dependency-graph.ts rename to sources/src/dependency-graph.ts diff --git a/src/errors.ts b/sources/src/errors.ts similarity index 100% rename from src/errors.ts rename to sources/src/errors.ts diff --git a/src/execution.ts b/sources/src/execution.ts similarity index 100% rename from src/execution.ts rename to sources/src/execution.ts diff --git a/src/gradlew.ts b/sources/src/gradlew.ts similarity index 100% rename from src/gradlew.ts rename to sources/src/gradlew.ts diff --git a/src/input-params.ts b/sources/src/input-params.ts similarity index 100% rename from src/input-params.ts rename to sources/src/input-params.ts diff --git a/src/job-summary.ts b/sources/src/job-summary.ts similarity index 100% rename from src/job-summary.ts rename to sources/src/job-summary.ts diff --git a/src/main.ts b/sources/src/main.ts similarity index 100% rename from src/main.ts rename to sources/src/main.ts diff --git a/src/post.ts b/sources/src/post.ts similarity index 100% rename from src/post.ts rename to sources/src/post.ts diff --git a/src/provision.ts b/sources/src/provision.ts similarity index 100% rename from src/provision.ts rename to sources/src/provision.ts diff --git a/src/repository-layout.ts b/sources/src/repository-layout.ts similarity index 100% rename from src/repository-layout.ts rename to sources/src/repository-layout.ts diff --git a/src/resources/init-scripts/gradle-build-action.build-result-capture-service.plugin.groovy b/sources/src/resources/init-scripts/gradle-build-action.build-result-capture-service.plugin.groovy similarity index 100% rename from src/resources/init-scripts/gradle-build-action.build-result-capture-service.plugin.groovy rename to sources/src/resources/init-scripts/gradle-build-action.build-result-capture-service.plugin.groovy diff --git a/src/resources/init-scripts/gradle-build-action.build-result-capture.init.gradle b/sources/src/resources/init-scripts/gradle-build-action.build-result-capture.init.gradle similarity index 100% rename from src/resources/init-scripts/gradle-build-action.build-result-capture.init.gradle rename to sources/src/resources/init-scripts/gradle-build-action.build-result-capture.init.gradle diff --git a/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy b/sources/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy similarity index 100% rename from src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy rename to sources/src/resources/init-scripts/gradle-build-action.github-dependency-graph-gradle-plugin-apply.groovy diff --git a/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle b/sources/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle similarity index 100% rename from src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle rename to sources/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle diff --git a/src/resources/init-scripts/gradle-build-action.inject-develocity.init.gradle b/sources/src/resources/init-scripts/gradle-build-action.inject-develocity.init.gradle similarity index 100% rename from src/resources/init-scripts/gradle-build-action.inject-develocity.init.gradle rename to sources/src/resources/init-scripts/gradle-build-action.inject-develocity.init.gradle diff --git a/src/resources/toolchains.xml b/sources/src/resources/toolchains.xml similarity index 100% rename from src/resources/toolchains.xml rename to sources/src/resources/toolchains.xml diff --git a/src/setup-gradle.ts b/sources/src/setup-gradle.ts similarity index 100% rename from src/setup-gradle.ts rename to sources/src/setup-gradle.ts diff --git a/test/init-scripts/.gitignore b/sources/test/init-scripts/.gitignore similarity index 100% rename from test/init-scripts/.gitignore rename to sources/test/init-scripts/.gitignore diff --git a/test/init-scripts/build.gradle b/sources/test/init-scripts/build.gradle similarity index 100% rename from test/init-scripts/build.gradle rename to sources/test/init-scripts/build.gradle diff --git a/test/init-scripts/gradle/wrapper/gradle-wrapper.jar b/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from test/init-scripts/gradle/wrapper/gradle-wrapper.jar rename to sources/test/init-scripts/gradle/wrapper/gradle-wrapper.jar diff --git a/test/init-scripts/gradle/wrapper/gradle-wrapper.properties b/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from test/init-scripts/gradle/wrapper/gradle-wrapper.properties rename to sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties diff --git a/test/init-scripts/gradlew b/sources/test/init-scripts/gradlew similarity index 100% rename from test/init-scripts/gradlew rename to sources/test/init-scripts/gradlew diff --git a/test/init-scripts/gradlew.bat b/sources/test/init-scripts/gradlew.bat similarity index 100% rename from test/init-scripts/gradlew.bat rename to sources/test/init-scripts/gradlew.bat diff --git a/test/init-scripts/settings.gradle b/sources/test/init-scripts/settings.gradle similarity index 100% rename from test/init-scripts/settings.gradle rename to sources/test/init-scripts/settings.gradle diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy similarity index 100% rename from test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy rename to sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy similarity index 100% rename from test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy rename to sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy similarity index 100% rename from test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy rename to sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy similarity index 100% rename from test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy rename to sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy diff --git a/test/jest/cache-cleanup.test.ts b/sources/test/jest/cache-cleanup.test.ts similarity index 100% rename from test/jest/cache-cleanup.test.ts rename to sources/test/jest/cache-cleanup.test.ts diff --git a/test/jest/cache-reporting.test.ts b/sources/test/jest/cache-reporting.test.ts similarity index 100% rename from test/jest/cache-reporting.test.ts rename to sources/test/jest/cache-reporting.test.ts diff --git a/test/jest/cache-utils.test.ts b/sources/test/jest/cache-utils.test.ts similarity index 100% rename from test/jest/cache-utils.test.ts rename to sources/test/jest/cache-utils.test.ts diff --git a/test/jest/dependency-graph.test.ts b/sources/test/jest/dependency-graph.test.ts similarity index 100% rename from test/jest/dependency-graph.test.ts rename to sources/test/jest/dependency-graph.test.ts diff --git a/test/jest/input-params.test.ts b/sources/test/jest/input-params.test.ts similarity index 100% rename from test/jest/input-params.test.ts rename to sources/test/jest/input-params.test.ts diff --git a/test/jest/resources/cache-cleanup/.gitattributes b/sources/test/jest/resources/cache-cleanup/.gitattributes similarity index 100% rename from test/jest/resources/cache-cleanup/.gitattributes rename to sources/test/jest/resources/cache-cleanup/.gitattributes diff --git a/test/jest/resources/cache-cleanup/.gitignore b/sources/test/jest/resources/cache-cleanup/.gitignore similarity index 100% rename from test/jest/resources/cache-cleanup/.gitignore rename to sources/test/jest/resources/cache-cleanup/.gitignore diff --git a/test/jest/resources/cache-cleanup/build.gradle b/sources/test/jest/resources/cache-cleanup/build.gradle similarity index 100% rename from test/jest/resources/cache-cleanup/build.gradle rename to sources/test/jest/resources/cache-cleanup/build.gradle diff --git a/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar b/sources/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar rename to sources/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.jar diff --git a/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties b/sources/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties rename to sources/test/jest/resources/cache-cleanup/gradle/wrapper/gradle-wrapper.properties diff --git a/test/jest/resources/cache-cleanup/gradlew b/sources/test/jest/resources/cache-cleanup/gradlew similarity index 100% rename from test/jest/resources/cache-cleanup/gradlew rename to sources/test/jest/resources/cache-cleanup/gradlew diff --git a/test/jest/resources/cache-cleanup/gradlew.bat b/sources/test/jest/resources/cache-cleanup/gradlew.bat similarity index 100% rename from test/jest/resources/cache-cleanup/gradlew.bat rename to sources/test/jest/resources/cache-cleanup/gradlew.bat diff --git a/test/jest/resources/cache-cleanup/settings.gradle b/sources/test/jest/resources/cache-cleanup/settings.gradle similarity index 100% rename from test/jest/resources/cache-cleanup/settings.gradle rename to sources/test/jest/resources/cache-cleanup/settings.gradle diff --git a/test/jest/resources/cache-cleanup/src/main/java/unused/dependencies/Library.java b/sources/test/jest/resources/cache-cleanup/src/main/java/unused/dependencies/Library.java similarity index 100% rename from test/jest/resources/cache-cleanup/src/main/java/unused/dependencies/Library.java rename to sources/test/jest/resources/cache-cleanup/src/main/java/unused/dependencies/Library.java diff --git a/tsconfig.json b/sources/tsconfig.json similarity index 100% rename from tsconfig.json rename to sources/tsconfig.json