Skip to content

Exclude path from clean #2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[![Build and Test](https://github.com/actions/checkout/actions/workflows/test.yml/badge.svg)](https://github.com/actions/checkout/actions/workflows/test.yml)

Changes compared to https://github.com/actions/checkout:
- Can exclude path when cleaning repository


# Checkout V4

This action checks-out your repository under `$GITHUB_WORKSPACE`, so your workflow can access it.
Expand Down Expand Up @@ -77,7 +81,10 @@ Please refer to the [release page](https://github.com/actions/checkout/releases/
# Whether to execute `git clean -ffdx && git reset --hard HEAD` before fetching
# Default: true
clean: ''


# Path to exclude from cleaning
exclude_from_clean: ''

# Partially clone against a given filter. Overrides sparse-checkout if set.
# Default: null
filter: ''
Expand Down
11 changes: 8 additions & 3 deletions src/git-command-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export interface IGitCommandManager {
submoduleUpdate(fetchDepth: number, recursive: boolean): Promise<void>
submoduleStatus(): Promise<boolean>
tagExists(pattern: string): Promise<boolean>
tryClean(): Promise<boolean>
tryClean(exclude_from_clean: string | undefined): Promise<boolean>
tryConfigUnset(configKey: string, globalConfig?: boolean): Promise<boolean>
tryDisableAutomaticGarbageCollection(): Promise<boolean>
tryGetFetchUrl(): Promise<string>
Expand Down Expand Up @@ -434,8 +434,13 @@ class GitCommandManager {
return !!output.stdout.trim()
}

async tryClean(): Promise<boolean> {
const output = await this.execGit(['clean', '-ffdx'], true)
async tryClean(exclude_from_clean: string | undefined): Promise<boolean> {
let output
if (exclude_from_clean === undefined) {
output = await this.execGit(['clean', '-ffdx'], true)
} else {
output = await this.execGit(['clean', '-ffdx', '-e', exclude_from_clean], true)
}
return output.exitCode === 0
}

Expand Down
3 changes: 2 additions & 1 deletion src/git-directory-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export async function prepareExistingDirectory(
repositoryPath: string,
repositoryUrl: string,
clean: boolean,
exclude_from_clean: string | undefined,
ref: string
): Promise<void> {
assert.ok(repositoryPath, 'Expected repositoryPath to be defined')
Expand Down Expand Up @@ -90,7 +91,7 @@ export async function prepareExistingDirectory(
// Clean
if (clean) {
core.startGroup('Cleaning the repository')
if (!(await git.tryClean())) {
if (!(await git.tryClean(exclude_from_clean))) {
core.debug(
`The clean command failed. This might be caused by: 1) path too long, 2) permission issue, or 3) file in use. For further investigation, manually run 'git clean -ffdx' on the directory '${repositoryPath}'.`
)
Expand Down
1 change: 1 addition & 0 deletions src/git-source-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export async function getSource(settings: IGitSourceSettings): Promise<void> {
settings.repositoryPath,
repositoryUrl,
settings.clean,
settings.exclude_from_clean,
settings.ref
)
}
Expand Down
5 changes: 5 additions & 0 deletions src/git-source-settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ export interface IGitSourceSettings {
*/
clean: boolean

/**
* Indicates path to exclude when cleaning
*/
exclude_from_clean: string | undefined

/**
* The filter determining which objects to include
*/
Expand Down
4 changes: 4 additions & 0 deletions src/input-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ export async function getInputs(): Promise<IGitSourceSettings> {
result.clean = (core.getInput('clean') || 'true').toUpperCase() === 'TRUE'
core.debug(`clean = ${result.clean}`)

// Clean
result.exclude_from_clean = core.getInput('exclude_from_clean')
core.debug(`exclude_from_clean = ${result.exclude_from_clean}`)

// Filter
const filter = core.getInput('filter')
if (filter) {
Expand Down