Revert "fix attempt to use dynamic secure-uplaod-artifact"

This reverts commit 90909d4.
slsa-framework · Mar 8, 2024 · 14806b8 · 14806b8
1 parent 90909d4
commit 14806b8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/actions/secure-upload-folder/action.yml b/.github/actions/secure-upload-folder/action.yml
@@ -24,14 +24,6 @@ inputs:
   path:
     description: 'Path to the folder'
     required: true
-  repo:
-    description: 'repo of secure-upload-artifact to use'
-    required: false
-    default: 'slsa-framework/slsa-github-generator'
-  ref:
-    description: 'ref of secure-upload-artifact to use'
-    required: false
-    default: 'main'
 outputs:
   sha256:
     description: "SHA256 of the uploaded tarball."
@@ -68,7 +60,7 @@ runs:
 
     - name: Upload the artifact
       id: upload
-      uses: "${{ inputs.repo }}.github/actions/secure-upload-artifact@${{ inputs.ref }}"
+      uses: slsa-framework/slsa-github-generator/.github/actions/secure-upload-artifact@main
       with:
         name: "${{ inputs.name }}"
         path: "${{ steps.create.outputs.tarball-path }}"
diff --git a/.github/workflows/pre-submit.actions.yml b/.github/workflows/pre-submit.actions.yml
@@ -260,16 +260,13 @@ jobs:
         with:
           name: "${{ env.ARTIFACT_NAME }}"
           path: "${{ env.UPLOAD_FOLDER_NAME }}"
-          repo: 
 
       - name: Upload
         id: upload-noroot
         uses: ./.github/actions/secure-upload-folder
         with:
           name: "${{ env.ARTIFACT_NO_ROOT_NAME }}"
           path: "${{ env.UPLOAD_FOLDER_NO_ROOT_NAME }}"
-          repo: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}
-          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
       - name: Download in new folder
         uses: ./.github/actions/secure-download-folder