Check PR against solution branch

RedHat-Middleware-Workshops · Dec 6, 2024 · 5c17c11 · 5c17c11
1 parent 7611ea3
commit 5c17c11
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -50,7 +50,7 @@ jobs:
         run: ./mvnw -B clean verify -Dmaven.compiler.release=${{ matrix.java }}
 
   check-commit-against-solution-branch:
-    if: (github.actor == 'dependabot[bot]') && (github.repository == 'RedHat-Middleware-Workshops/spring-jkube-external-config') && (github.event_name == 'pull_request')
+    if: (github.event_name == 'pull_request') && (github.repository == 'RedHat-Middleware-Workshops/spring-jkube-external-config') && ((github.actor == 'dependabot[bot]') || (github.event.pull_request.user.login == 'dependabot[bot]'))
     strategy:
       fail-fast: false
       matrix:
@@ -60,4 +60,5 @@ jobs:
     secrets: inherit
     with:
       java_version: ${{ matrix.java }}
-      ref: ${{ github.ref }}
+      pr_num: ${{ github.event.pull_request.number }}
+      pr_head_ref: ${{ github.head_ref }}
diff --git a/.github/workflows/check-against-solution.yml b/.github/workflows/check-against-solution.yml
@@ -3,8 +3,12 @@ name: Check PR against solution branch
 on:
   workflow_call:
     inputs:
-      ref:
-        description: The ref from the PR branch
+      pr_num:
+        description: The PR Number
+        required: true
+        type: string
+      pr_head_ref:
+        description: The PR head ref
         required: true
         type: string
       java_version:
@@ -17,6 +21,10 @@ concurrency:
   group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}, pr = ${{ github.event.pull_request.id }}"
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check-commit-against-solution-branch:
     runs-on: ubuntu-latest
@@ -26,12 +34,21 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: solution
+          path: src
+
+      - name: Get PR diff
+        run: wget ${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }}/pull/${{ inputs.pr_num }}.diff
 
       - name: Apply change
-        run: git merge --squash --stat ${{ inputs.ref }}
+        working-directory: src
+        run: git apply --stat -v ../${{ inputs.pr_num }}.diff
+#        run: |
+#          git fetch origin pull/${{ inputs.pr_num }}/head:${{ inputs.pr_head_ref }}
+#          git merge --squash --stat ${{ inputs.ref }}
 
       - name: Show diff
-        run: git diff main
+        working-directory: src
+        run: git status
 
       - name: Setup Java ${{ inputs.java_version }}
         uses: actions/setup-java@v4
@@ -41,4 +58,5 @@ jobs:
           cache: maven
 
       - name: Run build and tests with Java ${{ inputs.java_version }}
+        working-directory: src
         run: ./mvnw -B clean verify -Dmaven.compiler.release=${{ inputs.java_version }}