From 8121628c10d24297178f82a2287f604c1ee409fd Mon Sep 17 00:00:00 2001
From: aalu1418 <50029043+aalu1418@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:57:44 -0700
Subject: [PATCH] commit signing for solana image bump

---
 .github/workflows/dependency-updates.yml | 52 ++++++++++++++++--------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 04cf968e5..93ca7a5fe 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -28,19 +28,39 @@ jobs:
           if ((prs > 0)); then
               echo "skip=true" >> "$GITHUB_OUTPUT"
           fi
+      - name: "Create new branch if needed"
+        id: branch
+        if: '!steps.check.outputs.skip'
+        run: |
+          echo "original=${{ github.head_ref || github.ref_name }}" >> $GITHUB_OUTPUT
+          git branch "bump/solana-${{ steps.solImage.outputs.image }}" 
+          git push origin "bump/solana-${{ steps.solImage.outputs.image }}" 
+      - uses: planetscale/ghcommit-action@v0.1.33
+        if: '!steps.check.outputs.skip'
+        with:
+          commit_message: "[automated] bump solana dependencies"
+          repo: ${{ github.repository }}
+          branch: "bump/solana-${{ steps.solImage.outputs.image }}" 
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Cleanup branch"
+        if: '!steps.check.outputs.skip'
+        run: |
+          git reset --hard
+          git branch --set-upstream-to=origin/bump/solana-${{ steps.solImage.outputs.image }} 
+          git pull
       - name: Create pull request
         if: '!steps.check.outputs.skip'
         uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
         with:
           title: "[automated] bump solana image to ${{ steps.solImage.outputs.image }}"
-          branch: bump/solana-${{ steps.solImage.outputs.image }}
-          author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
+          base: ${{ steps.branch.outputs.original }}
+          branch: bump/solana-${{ steps.solImage.outputs.image }} 
           reviewers: aalu1418
-          commit-message: "[automated] bump solana dependencies"
           body: |
             Latest Solana mainnet release is [\"${{ steps.solImage.outputs.image }}\"](https://github.com/solana-labs/solana/releases/latest)
             (run CI by closing + reopening PR)
-  E2E-Testing-Dependencies:
+  E2Eing-Dependencies:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -60,19 +80,19 @@ jobs:
         id: coreCTF
         working-directory: ./chainlink
         run: |
-          cd integration-tests
-          version=$(go list -m github.com/smartcontractkit/chainlink-testing-framework | awk '{print $NF}')
-          echo "chainlink/integration-tests CTF: $version"
+          cd integrations
+          version=$(go list -m github.com/smartcontractkit/chainlinking-framework | awk '{print $NF}')
+          echo "chainlink/integrations CTF: $version"
           echo "version=$version" >> "$GITHUB_OUTPUT"
           cd ../../
           rm -rf chainlink
-      # -------- Compare to chainlink-solana/integration-tests --------------
+      # -------- Compare to chainlink-solana/integrations --------------
       - name: Check CTF version in chainlink-solana
         id: solanaCTF
         run: |
-          cd integration-tests
-          version=$(go list -m github.com/smartcontractkit/chainlink-testing-framework | awk '{print $NF}')
-          echo "chainlink-solana/integrationt-tests CTF: $version"
+          cd integrations
+          version=$(go list -m github.com/smartcontractkit/chainlinking-framework | awk '{print $NF}')
+          echo "chainlink-solana/integrationts CTF: $version"
           echo "version=$version" >> "$GITHUB_OUTPUT"
       - name: Update integration test dependencies
         if: ${{ steps.coreCTF.outputs.version != steps.solanaCTF.outputs.version }}
@@ -87,7 +107,7 @@ jobs:
         run: |
           prs=$(gh pr list \
               --repo "$GITHUB_REPOSITORY" \
-              --head "bump/e2e-test-deps-${{ steps.coreCTF.outputs.version }}" \
+              --head "bump/e2e-deps-${{ steps.coreCTF.outputs.version }}" \
               --json title \
               --jq 'length')
           if ((prs > 0)); then
@@ -97,11 +117,11 @@ jobs:
         if: '!steps.check.outputs.skip'
         uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
         with:
-          title: "[automated] bump e2e test deps to match chainlink/integration-tests"
-          branch: bump/e2e-test-deps-${{ steps.coreCTF.outputs.version }}
+          title: "[automated] bump e2e test deps to match chainlink/integrations"
+          branch: bump/e2e-deps-${{ steps.coreCTF.outputs.version }}
           author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
           reviewers: aalu1418
-          commit-message: "[automated] bump e2e <> core/integration-tests dependencies"
+          commit-message: "[automated] bump e2e <> core/integrations dependencies"
           body: | 
-            chainlink/integration-tests uses chainlink-testing-framework@${{ steps.coreCTF.outputs.version }}
+            chainlink/integrations uses chainlinking-framework@${{ steps.coreCTF.outputs.version }}
             (run CI by closing + reopening PR)