Fix cache (#33)

Author: ShakedZrihen

action.yml

@@ -31,19 +31,18 @@ inputs:
 runs:
   using: 'composite'
   steps:
+    - name: Set start time
+      id: start
+      run: echo "timestamp=$EPOCHSECONDS" >> $GITHUB_OUTPUT
+      shell: bash
+
     - name: Cache gitstream folder
       id: cache-gitstream
       uses: actions/cache@v3
       with:
         path: gitstream
-        key: ${{ fromJSON(fromJSON(github.event.inputs.client_payload)).repo }}-gitsream-cache
-        restore-keys: ${{ fromJSON(fromJSON(github.event.inputs.client_payload)).repo }}-gitsream-cache
-        
-    - name: Set start time
-      id: start
-      run: echo "timestamp=$EPOCHSECONDS" >> $GITHUB_OUTPUT
-      shell: bash
-      
+        key: ${{ fromJSON(fromJSON(github.event.inputs.client_payload)).headSha }}-${{ fromJSON(fromJSON(github.event.inputs.client_payload)).repo }}-gitsream-cache
+
     - name: Create GitStream folder
       ## this step will be skipped if cache exists
       if: ${{ steps.cache-gitstream.outputs.cache-hit != 'true' }}
@@ -53,17 +52,18 @@ runs:
         mkdir gitstream
         cd gitstream
         mkdir repo
-        
+        mkdir temp
+
     - name: Checkout head branch
       ## this step will be skipped if cache exists
-      if: ${{ steps.cache-gitstream.outputs.cache-hit != 'true' }}
       uses: actions/checkout@v3
+      if: ${{ steps.cache-gitstream.outputs.cache-hit != 'true' }}
       with:
         repository: ${{ inputs.full_repository }}
         ref: ${{ github.event.inputs.head_ref }}
         path: 'gitstream/repo/'
         token: ${{ fromJSON(fromJSON(github.event.inputs.client_payload)).githubToken || github.token }}
-    
+
     - run: |
         all=2147483647
         cd gitstream
@@ -74,18 +74,7 @@ runs:
         git fetch --deepen=$all origin ${{ github.event.inputs.head_ref }}
       shell: bash
       if: ${{ steps.cache-gitstream.outputs.cache-hit != 'true' }}
-      
-    - run: |
-        cd gitstream
-        cd repo
-        git fetch origin ${{ github.event.inputs.base_ref }}
-        git checkout ${{ github.event.inputs.head_ref }}
-        git stash
-        git pull origin ${{ github.event.inputs.head_ref }}
-      shell: bash
-      ## this step will NOT run when cache exists
-      if: ${{ steps.cache-gitstream.outputs.cache-hit == 'true' }}
-      
+
     - name: Create cm folder
       ## this step will be skipped if cache exists
       if: ${{ steps.cache-gitstream.outputs.cache-hit != 'true' }}
@@ -94,7 +83,7 @@ runs:
       run: |
         cd gitstream
         mkdir cm
-     
+
     - name: Checkout cm repo
       uses: actions/checkout@v3
       ## this step will be skipped if cache exists AND has cm repo
@@ -103,7 +92,7 @@ runs:
         repository: '${{ fromJSON(fromJSON(github.event.inputs.client_payload)).owner }}/${{ fromJSON(fromJSON(github.event.inputs.client_payload)).cmRepo }}'
         ref: ${{ fromJSON(fromJSON(github.event.inputs.client_payload)).cmRepoRef }}
         path: 'gitstream/cm/'
-    
+
     - name: Run The Action
       id: gitstream-action
       if: always()