Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support for git fecth with depth > 0 from BuildEnv #2916

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 3, 2023
Merged

Support for git fecth with depth > 0 from BuildEnv #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ce2fc
Support for git fecth with depth > 0 from BuildEnv
Mar 3, 2023
6cbf095
fixup! Support for git fecth with depth > 0 from BuildEnv
Mar 3, 2023
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
14 changes: 11 additions & 3 deletions rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.openrewrite.internal.lang.Nullable;
import org.openrewrite.marker.ci.*;

import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.URI;
Expand Down Expand Up @@ -160,10 +161,17 @@ public static GitProvenance fromProjectDirectory(Path projectDir) {
throw new UncheckedIOException(e);
}
} else {
try {
return environment.buildGitProvenance();
} catch (IncompleteGitConfigException e) {
File gitDir = new RepositoryBuilder().findGitDir(projectDir.toFile()).getGitDir();
if (gitDir != null && gitDir.exists()) {
//it has been cloned with --depth > 0
return fromGitConfig(projectDir);
} else {
//there is not .git config
try {
return environment.buildGitProvenance();
} catch (IncompleteGitConfigException e) {
return fromGitConfig(projectDir);
}
}
}
} else {
Expand Down
19 changes: 19 additions & 0 deletions rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRefNameException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.RepositoryCache;
import org.eclipse.jgit.transport.TagOpt;
Expand Down Expand Up @@ -276,6 +277,24 @@ void supportsGitHubActions(@TempDir Path projectDir) {
assertThat(prov.getChange()).isEqualTo("287364287357");
}

@Test
void ignoresBuildEnvironmentIfThereIsGitConfig(@TempDir Path projectDir) throws GitAPIException {
Map<String, String> envVars = new HashMap<>();
envVars.put("GITHUB_API_URL", "https://api.github.com");
envVars.put("GITHUB_REPOSITORY", "octocat/Hello-World");
envVars.put("GITHUB_REF", "refs/heads/foo");
envVars.put("GITHUB_SHA", "287364287357");
envVars.put("GITHUB_HEAD_REF", "");
try (Git g = Git.init().setDirectory(projectDir.toFile()).setInitialBranch("main").call()) {
GitProvenance prov = GitProvenance.fromProjectDirectory(projectDir,
GithubActionsBuildEnvironment.build(var -> envVars.get(var)));
assertThat(prov != null);
assertThat(prov.getOrigin()).isNotEqualTo("https://github.com/octocat/Hello-World.git");
assertThat(prov.getBranch()).isEqualTo("main");
assertThat(prov.getChange()).isNotEqualTo("287364287357");
}
}

@Test
void supportsCustomBuildEnvironment(@TempDir Path projectDir) {
Map<String, String> envVars = new HashMap<>();
Expand Down