Fail on delegation from legacy actions

This commit is contained in:
daz 2024-07-19 15:03:13 -06:00
parent ded8009fcf
commit 2041ce6ab1
No known key found for this signature in database
3 changed files with 10 additions and 13 deletions

View File

@ -10,7 +10,7 @@ import {
getActionId, getActionId,
setActionId setActionId
} from '../../configuration' } from '../../configuration'
import {recordDeprecation, saveDeprecationState} from '../../deprecation-collector' import {failOnUseOfRemovedFeature, saveDeprecationState} from '../../deprecation-collector'
import {handleMainActionError} from '../../errors' import {handleMainActionError} from '../../errors'
/** /**
@ -19,14 +19,13 @@ import {handleMainActionError} from '../../errors'
export async function run(): Promise<void> { export async function run(): Promise<void> {
try { try {
if (getActionId() === 'gradle/gradle-build-action') { if (getActionId() === 'gradle/gradle-build-action') {
failOnUseOfRemovedFeature(
recordDeprecation(
'The action `gradle/gradle-build-action` has been replaced by `gradle/actions/setup-gradle`' 'The action `gradle/gradle-build-action` has been replaced by `gradle/actions/setup-gradle`'
) )
} else {
setActionId('gradle/actions/setup-gradle')
} }
setActionId('gradle/actions/setup-gradle')
// Check for invalid wrapper JARs if requested // Check for invalid wrapper JARs if requested
if (doValidateWrappers()) { if (doValidateWrappers()) {
await setupGradle.checkNoInvalidWrapperJars() await setupGradle.checkNoInvalidWrapperJars()

View File

@ -3,19 +3,19 @@ import * as core from '@actions/core'
import * as validate from '../../wrapper-validation/validate' import * as validate from '../../wrapper-validation/validate'
import {getActionId, setActionId} from '../../configuration' import {getActionId, setActionId} from '../../configuration'
import {recordDeprecation, emitDeprecationWarnings} from '../../deprecation-collector' import {failOnUseOfRemovedFeature, emitDeprecationWarnings} from '../../deprecation-collector'
import {handleMainActionError} from '../../errors' import {handleMainActionError} from '../../errors'
export async function run(): Promise<void> { export async function run(): Promise<void> {
try { try {
if (getActionId() === 'gradle/wrapper-validation-action') { if (getActionId() === 'gradle/wrapper-validation-action') {
recordDeprecation( failOnUseOfRemovedFeature(
'The action `gradle/wrapper-validation-action` has been replaced by `gradle/actions/wrapper-validation`' 'The action `gradle/wrapper-validation-action` has been replaced by `gradle/actions/wrapper-validation`'
) )
} else {
setActionId('gradle/actions/wrapper-validation')
} }
setActionId('gradle/actions/wrapper-validation')
const result = await validate.findInvalidWrapperJars( const result = await validate.findInvalidWrapperJars(
path.resolve('.'), path.resolve('.'),
+core.getInput('min-wrapper-count'), +core.getInput('min-wrapper-count'),

View File

@ -22,11 +22,9 @@ export function recordDeprecation(message: string): void {
} }
} }
export function failOnUseOfRemovedFeature(removalMessage: string, deprecationMessage: string): void { export function failOnUseOfRemovedFeature(removalMessage: string, deprecationMessage: string = removalMessage): void {
const deprecation = new Deprecation(deprecationMessage) const deprecation = new Deprecation(deprecationMessage)
core.error( core.error(`${removalMessage}. See ${deprecation.getDocumentationLink()}`)
`${removalMessage}. See ${deprecation.getDocumentationLink()}`
)
} }
export function getDeprecations(): Deprecation[] { export function getDeprecations(): Deprecation[] {