Skip to content

Commit da5bdc7

Browse files
authored
chore: fix wrong output in gradle builder (#2646)
Fixes slsa-framework/example-package#274 cc @laurentsimon Signed-off-by: AdamKorcz <[email protected]>
1 parent 180a89c commit da5bdc7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

internal/builders/gradle/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ runs:
6161
- name: Setup Gradle
6262
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # v2.7.0
6363
- name: Run gradle builder
64+
id: run_gradle_builder
6465
shell: bash
6566
env:
6667
UNTRUSTED_PROJECT_ROOT: ${{ fromJson(inputs.slsa-workflow-inputs).directory }}
@@ -93,26 +94,25 @@ runs:
9394
&& ./gradlew build -x test
9495
9596
- name: Put release artifacts in one directory
96-
id: collect_release_artifacts
9797
shell: bash
9898
env:
9999
SLSA_OUTPUTS_ARTIFACTS_FILE: ${{ inputs.slsa-layout-file }}
100100
UNTRUSTED_ARTIFACT_LIST: ${{ fromJson(inputs.slsa-workflow-inputs).artifact-list }}
101-
PROJECT_ROOT: ${{ steps.collect_release_artifacts.outputs.validated_project_root }}
101+
PROJECT_ROOT: ${{ steps.run_gradle_builder.outputs.validated_project_root }}
102102
run: |
103103
cd "${PROJECT_ROOT}" && "${GITHUB_WORKSPACE}"/../__TOOL_ACTION_DIR__/collect_release_artifacts.sh
104104
- name: Make outputs
105105
id: make-outputs
106106
shell: bash
107107
env:
108108
SLSA_OUTPUTS_ARTIFACTS_FILE: ${{ inputs.slsa-layout-file }}
109-
PROJECT_ROOT: ${{ steps.collect_release_artifacts.outputs.validated_project_root }}
109+
PROJECT_ROOT: ${{ steps.run_gradle_builder.outputs.validated_project_root }}
110110
run: |
111111
cd "${PROJECT_ROOT}" && "${GITHUB_WORKSPACE}"/../__TOOL_ACTION_DIR__/create_attestation.sh
112112
- name: Move build dir to avoid making it a sub-dir when uploading
113113
shell: bash
114114
env:
115-
PROJECT_ROOT: ${{ steps.collect_release_artifacts.outputs.validated_project_root }}
115+
PROJECT_ROOT: ${{ steps.run_gradle_builder.outputs.validated_project_root }}
116116
run: |
117117
mv "${PROJECT_ROOT}"/build "${GITHUB_WORKSPACE}"/
118118
- name: Upload build dir

0 commit comments

Comments
 (0)