mirror of
https://github.com/gradle/gradle-build-action.git
synced 2024-11-25 01:31:06 -05:00
Fix dependency-graph with configuration-cache
When state is reused from the configuration cache, no dependencies are resolved. This fix prevents the action from submitting an empty dependency graph in this case.
This commit is contained in:
parent
932abbbe13
commit
0e6b90783e
4 changed files with 43 additions and 12 deletions
|
@ -90,11 +90,15 @@ jobs:
|
||||||
- id: gradle-build
|
- id: gradle-build
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
working-directory: .github/workflow-samples/groovy-dsl
|
working-directory: .github/workflow-samples/groovy-dsl
|
||||||
|
- id: gradle-build-again
|
||||||
|
run: ./gradlew build
|
||||||
|
working-directory: .github/workflow-samples/groovy-dsl
|
||||||
- name: Check generated dependency graphs
|
- name: Check generated dependency graphs
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "gradle-assemble report file: ${{ steps.gradle-assemble.outputs.dependency-graph-file }}"
|
echo "gradle-assemble report file: ${{ steps.gradle-assemble.outputs.dependency-graph-file }}"
|
||||||
echo "gradle-build report file: ${{ steps.gradle-build.outputs.dependency-graph-file }}"
|
echo "gradle-build report file: ${{ steps.gradle-build.outputs.dependency-graph-file }}"
|
||||||
|
echo "gradle-build-again report file: ${{ steps.gradle-build-again.outputs.dependency-graph-file }}"
|
||||||
ls -l dependency-graph-reports
|
ls -l dependency-graph-reports
|
||||||
if [ ! -e "${{ steps.gradle-assemble.outputs.dependency-graph-file }}" ]; then
|
if [ ! -e "${{ steps.gradle-assemble.outputs.dependency-graph-file }}" ]; then
|
||||||
echo "Did not find gradle-assemble dependency graph file"
|
echo "Did not find gradle-assemble dependency graph file"
|
||||||
|
@ -104,3 +108,41 @@ jobs:
|
||||||
echo "Did not find gradle-build dependency graph files"
|
echo "Did not find gradle-build dependency graph files"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
if [ ! -e "${{ steps.gradle-build-again.outputs.dependency-graph-file }}" ]; then
|
||||||
|
echo "Did not find gradle-build-again dependency graph files"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
config-cache:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout sources
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Download distribution if required
|
||||||
|
uses: ./.github/actions/download-dist
|
||||||
|
- name: Setup Gradle for dependency-graph generate
|
||||||
|
uses: ./
|
||||||
|
with:
|
||||||
|
dependency-graph: generate-and-submit
|
||||||
|
- id: config-cache-store
|
||||||
|
run: ./gradlew assemble --configuration-cache
|
||||||
|
working-directory: .github/workflow-samples/groovy-dsl
|
||||||
|
- name: Check and delete generated dependency graph
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ ! -e "${{ steps.config-cache-store.outputs.dependency-graph-file }}" ]; then
|
||||||
|
echo "Did not find config-cache-store dependency graph files"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm ${{ steps.config-cache-store.outputs.dependency-graph-file }}
|
||||||
|
- id: config-cache-reuse
|
||||||
|
run: ./gradlew assemble --configuration-cache
|
||||||
|
working-directory: .github/workflow-samples/groovy-dsl
|
||||||
|
- name: Check no dependency graph is generated
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ ! -z "$(ls -A dependency-graph-reports)" ]; then
|
||||||
|
echo "Expected no dependency graph files to be generated"
|
||||||
|
ls -l dependency-graph-reports
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
|
@ -9,7 +9,7 @@ buildscript {
|
||||||
maven { url pluginRepositoryUrl }
|
maven { url pluginRepositoryUrl }
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.gradle:github-dependency-graph-gradle-plugin:1.0.0"
|
classpath "org.gradle:github-dependency-graph-gradle-plugin:1.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
apply plugin: org.gradle.github.GitHubDependencyGraphPlugin
|
apply plugin: org.gradle.github.GitHubDependencyGraphPlugin
|
||||||
|
|
|
@ -22,11 +22,6 @@ if (isTopLevelBuild) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
def githubOutput = System.getenv("GITHUB_OUTPUT")
|
|
||||||
if (githubOutput) {
|
|
||||||
new File(githubOutput) << "dependency-graph-file=${reportFile.absolutePath}\n"
|
|
||||||
}
|
|
||||||
|
|
||||||
println "Generating dependency graph into '${reportFile}'"
|
println "Generating dependency graph into '${reportFile}'"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ class TestDependencyGraph extends BaseInitScriptTest {
|
||||||
|
|
||||||
then:
|
then:
|
||||||
assert reportFile.exists()
|
assert reportFile.exists()
|
||||||
assert gitHubOutputFile.text == "dependency-graph-file=${reportFile.absolutePath}\n"
|
|
||||||
|
|
||||||
where:
|
where:
|
||||||
testGradleVersion << [GRADLE_8_X]
|
testGradleVersion << [GRADLE_8_X]
|
||||||
|
@ -116,7 +115,6 @@ class TestDependencyGraph extends BaseInitScriptTest {
|
||||||
GITHUB_DEPENDENCY_GRAPH_SHA: "123456",
|
GITHUB_DEPENDENCY_GRAPH_SHA: "123456",
|
||||||
GITHUB_DEPENDENCY_GRAPH_WORKSPACE: testProjectDir.absolutePath,
|
GITHUB_DEPENDENCY_GRAPH_WORKSPACE: testProjectDir.absolutePath,
|
||||||
DEPENDENCY_GRAPH_REPORT_DIR: reportsDir.absolutePath,
|
DEPENDENCY_GRAPH_REPORT_DIR: reportsDir.absolutePath,
|
||||||
GITHUB_OUTPUT: gitHubOutputFile.absolutePath
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,8 +125,4 @@ class TestDependencyGraph extends BaseInitScriptTest {
|
||||||
def getReportFile() {
|
def getReportFile() {
|
||||||
return new File(reportsDir, "CORRELATOR.json")
|
return new File(reportsDir, "CORRELATOR.json")
|
||||||
}
|
}
|
||||||
|
|
||||||
def getGitHubOutputFile() {
|
|
||||||
return new File(testProjectDir, "GITHUB_OUTPUT")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue