From 72dde7ef1efd461b5443bbb36cd556e428b32801 Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 18 Jul 2024 11:09:54 -0600 Subject: [PATCH] Move action entry-point sources --- sources/package.json | 10 +++++----- .../src/{ => actions}/dependency-submission/main.ts | 12 ++++++------ .../src/{ => actions}/dependency-submission/post.ts | 6 +++--- sources/src/{ => actions}/setup-gradle/main.ts | 12 ++++++------ sources/src/{ => actions}/setup-gradle/post.ts | 10 +++++----- sources/src/{ => actions}/wrapper-validation/main.ts | 8 ++++---- 6 files changed, 29 insertions(+), 29 deletions(-) rename sources/src/{ => actions}/dependency-submission/main.ts (87%) rename sources/src/{ => actions}/dependency-submission/post.ts (82%) rename sources/src/{ => actions}/setup-gradle/main.ts (81%) rename sources/src/{ => actions}/setup-gradle/post.ts (84%) rename sources/src/{ => actions}/wrapper-validation/main.ts (83%) diff --git a/sources/package.json b/sources/package.json index f2653f25..ae3f39b4 100644 --- a/sources/package.json +++ b/sources/package.json @@ -8,11 +8,11 @@ "prettier-write": "prettier --write 'src/**/*.ts'", "prettier-check": "prettier --check 'src/**/*.ts'", "lint": "eslint 'src/**/*.ts'", - "compile-dependency-submission-main": "ncc build src/dependency-submission/main.ts --out dist/dependency-submission/main --source-map --no-source-map-register", - "compile-dependency-submission-post": "ncc build src/dependency-submission/post.ts --out dist/dependency-submission/post --source-map --no-source-map-register", - "compile-setup-gradle-main": "ncc build src/setup-gradle/main.ts --out dist/setup-gradle/main --source-map --no-source-map-register", - "compile-setup-gradle-post": "ncc build src/setup-gradle/post.ts --out dist/setup-gradle/post --source-map --no-source-map-register", - "compile-wrapper-validation-main": "ncc build src/wrapper-validation/main.ts --out dist/wrapper-validation/main --source-map --no-source-map-register", + "compile-dependency-submission-main": "ncc build src/actions/dependency-submission/main.ts --out dist/dependency-submission/main --source-map --no-source-map-register", + "compile-dependency-submission-post": "ncc build src/actions/dependency-submission/post.ts --out dist/dependency-submission/post --source-map --no-source-map-register", + "compile-setup-gradle-main": "ncc build src/actions/setup-gradle/main.ts --out dist/setup-gradle/main --source-map --no-source-map-register", + "compile-setup-gradle-post": "ncc build src/actions/setup-gradle/post.ts --out dist/setup-gradle/post --source-map --no-source-map-register", + "compile-wrapper-validation-main": "ncc build src/actions/wrapper-validation/main.ts --out dist/wrapper-validation/main --source-map --no-source-map-register", "compile": "npm-run-all --parallel compile-*", "check": "npm-run-all --parallel prettier-check lint", "format": "npm-run-all --parallel prettier-write lint", diff --git a/sources/src/dependency-submission/main.ts b/sources/src/actions/dependency-submission/main.ts similarity index 87% rename from sources/src/dependency-submission/main.ts rename to sources/src/actions/dependency-submission/main.ts index 75c46686..72221847 100644 --- a/sources/src/dependency-submission/main.ts +++ b/sources/src/actions/dependency-submission/main.ts @@ -1,7 +1,7 @@ import * as core from '@actions/core' -import * as setupGradle from '../setup-gradle' -import * as gradle from '../execution/gradle' -import * as dependencyGraph from '../dependency-graph' +import * as setupGradle from '../../setup-gradle' +import * as gradle from '../../execution/gradle' +import * as dependencyGraph from '../../dependency-graph' import {parseArgsStringToArgv} from 'string-argv' import { @@ -11,9 +11,9 @@ import { DependencyGraphOption, GradleExecutionConfig, setActionId -} from '../configuration' -import {saveDeprecationState} from '../deprecation-collector' -import {handleMainActionError} from '../errors' +} from '../../configuration' +import {saveDeprecationState} from '../../deprecation-collector' +import {handleMainActionError} from '../../errors' /** * The main entry point for the action, called by Github Actions for the step. diff --git a/sources/src/dependency-submission/post.ts b/sources/src/actions/dependency-submission/post.ts similarity index 82% rename from sources/src/dependency-submission/post.ts rename to sources/src/actions/dependency-submission/post.ts index 743478e5..c39e2f8a 100644 --- a/sources/src/dependency-submission/post.ts +++ b/sources/src/actions/dependency-submission/post.ts @@ -1,7 +1,7 @@ -import * as setupGradle from '../setup-gradle' +import * as setupGradle from '../../setup-gradle' -import {CacheConfig, SummaryConfig} from '../configuration' -import {handlePostActionError} from '../errors' +import {CacheConfig, SummaryConfig} from '../../configuration' +import {handlePostActionError} from '../../errors' // Catch and log any unhandled exceptions. These exceptions can leak out of the uploadChunk method in // @actions/toolkit when a failed upload closes the file descriptor causing any in-process reads to diff --git a/sources/src/setup-gradle/main.ts b/sources/src/actions/setup-gradle/main.ts similarity index 81% rename from sources/src/setup-gradle/main.ts rename to sources/src/actions/setup-gradle/main.ts index f5bc5c45..7012f5d2 100644 --- a/sources/src/setup-gradle/main.ts +++ b/sources/src/actions/setup-gradle/main.ts @@ -1,6 +1,6 @@ -import * as setupGradle from '../setup-gradle' -import * as gradle from '../execution/gradle' -import * as dependencyGraph from '../dependency-graph' +import * as setupGradle from '../../setup-gradle' +import * as gradle from '../../execution/gradle' +import * as dependencyGraph from '../../dependency-graph' import { BuildScanConfig, CacheConfig, @@ -9,9 +9,9 @@ import { doValidateWrappers, getActionId, setActionId -} from '../configuration' -import {recordDeprecation, saveDeprecationState} from '../deprecation-collector' -import {handleMainActionError} from '../errors' +} from '../../configuration' +import {recordDeprecation, saveDeprecationState} from '../../deprecation-collector' +import {handleMainActionError} from '../../errors' /** * The main entry point for the action, called by Github Actions for the step. diff --git a/sources/src/setup-gradle/post.ts b/sources/src/actions/setup-gradle/post.ts similarity index 84% rename from sources/src/setup-gradle/post.ts rename to sources/src/actions/setup-gradle/post.ts index b39f77d1..29ce31ca 100644 --- a/sources/src/setup-gradle/post.ts +++ b/sources/src/actions/setup-gradle/post.ts @@ -1,9 +1,9 @@ -import * as setupGradle from '../setup-gradle' -import * as dependencyGraph from '../dependency-graph' +import * as setupGradle from '../../setup-gradle' +import * as dependencyGraph from '../../dependency-graph' -import {CacheConfig, DependencyGraphConfig, SummaryConfig} from '../configuration' -import {handlePostActionError} from '../errors' -import {emitDeprecationWarnings, restoreDeprecationState} from '../deprecation-collector' +import {CacheConfig, DependencyGraphConfig, SummaryConfig} from '../../configuration' +import {handlePostActionError} from '../../errors' +import {emitDeprecationWarnings, restoreDeprecationState} from '../../deprecation-collector' // Catch and log any unhandled exceptions. These exceptions can leak out of the uploadChunk method in // @actions/toolkit when a failed upload closes the file descriptor causing any in-process reads to diff --git a/sources/src/wrapper-validation/main.ts b/sources/src/actions/wrapper-validation/main.ts similarity index 83% rename from sources/src/wrapper-validation/main.ts rename to sources/src/actions/wrapper-validation/main.ts index 52b6d4f4..ca1453e6 100644 --- a/sources/src/wrapper-validation/main.ts +++ b/sources/src/actions/wrapper-validation/main.ts @@ -1,10 +1,10 @@ import * as path from 'path' import * as core from '@actions/core' -import * as validate from './validate' -import {getActionId, setActionId} from '../configuration' -import {recordDeprecation, emitDeprecationWarnings} from '../deprecation-collector' -import {handleMainActionError} from '../errors' +import * as validate from '../../wrapper-validation/validate' +import {getActionId, setActionId} from '../../configuration' +import {recordDeprecation, emitDeprecationWarnings} from '../../deprecation-collector' +import {handleMainActionError} from '../../errors' export async function run(): Promise { try {