CLOUDP-231603: Fix updating dependabot licenses

Signed-off-by: jose.vazquez <jose.vazquez@mongodb.com>
mongodb · Feb 29, 2024 · 29eb518 · 29eb518
1 parent 7f38fa5
commit 29eb518
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,8 +34,6 @@ jobs:
     uses: ./.github/workflows/test-unit.yml
 
   check-licenses:
-    # Dependabot changes do not update licenses, so will never pass this check
-    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
     uses: ./.github/workflows/check-licenses.yml
 
   cloud-tests-filter:

diff --git a/.github/workflows/update-licenses.yml b/.github/workflows/update-licenses.yml
@@ -1,6 +1,10 @@
 name: Update dependabot PR Licenses
 on:
   workflow_dispatch:
+    inputs:
+      branch:
+        description: "Branch to patch"
+        required: true
   push:
     branches:
       - dependabot/go_modules/**
@@ -12,22 +16,31 @@ jobs:
   run:
     name: Recompute licenses & update PR
     runs-on: ubuntu-latest
+    env:
+      BRANCH: ${{ inputs.branch || github.ref_name  }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.BRANCH }}
 
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
           go-version-file: "${{ github.workspace }}/go.mod"
           cache: false
 
-      - name: recompute licenses
+      - name: Recompute licenses
         run: make recompute-licenses
 
-      - uses: stefanzweifel/git-auto-commit-action@v4.1.1
-        with:
-          commit_message: |
-            Updated dependency licenses
-
-            dependabot skip
-          branch: ${{ github.head_ref }}
+      - name: Commit as needed
+        run: |
+          if [[ $(git diff --stat) != '' ]]; then
+            echo 'Committing changes'
+            git config user.email "akobot@ako-team-fake.mongodb.com"
+            git config user.name "AKOBot"
+            git add .
+            git commit -m "Fix licenses after dependabot changes" -m "[dependabot skip]"
+            git push
+          else
+            echo 'Clean nothing to do'
+          fi