From 99f37569c4f109c61abb2896c476931072e09456 Mon Sep 17 00:00:00 2001
From: cgranleese-r7 <Christopher_Granleese@rapid7.com>
Date: Tue, 15 Oct 2024 15:11:27 +0100
Subject: [PATCH] Fixes acceptance tests report generation

---
 ...ploit-framework-meterpreter_acceptance.yml | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/metasploit-framework-meterpreter_acceptance.yml b/.github/workflows/metasploit-framework-meterpreter_acceptance.yml
index 5a7620c15..407e54563 100644
--- a/.github/workflows/metasploit-framework-meterpreter_acceptance.yml
+++ b/.github/workflows/metasploit-framework-meterpreter_acceptance.yml
@@ -50,26 +50,13 @@ on:
 #    - cron: '*/15 * * * *'
 
 jobs:
-  extract_current_branch:
-    name: Extract branch name
-    runs-on: ubuntu-latest
-    steps:
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
   # Compile Java Meterpreter via docker if required, we can't always do this on the
   # host environment (i.e. for macos). So it instead gets compiled first on a linux
   # host, then the artifacts are copied back to the host later
   java_meterpreter_compilation:
-    needs: extract_current_branch
     name: Compile Java Meterpreter
     runs-on: ubuntu-latest
 
-    env:
-      metasploitPayloadsCommit: ${{ needs.extract_current_branch.outputs.branch }}
-
     steps:
       - name: Checkout metasploit-payloads
         uses: actions/checkout@v4
@@ -283,7 +270,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        if: always()
+        with:
+          repository: rapid7/metasploit-framework
+          path: metasploit-framework
+          ref: ${{ env.metasploitFrameworkCommit }}
 
       - name: Install system dependencies (Linux)
         if: always()
@@ -298,6 +288,7 @@ jobs:
           ruby-version: '3.3'
           bundler-cache: true
           cache-version: 5
+          working-directory: metasploit-framework
 
       - uses: actions/download-artifact@v4
         id: raw_report_data
@@ -319,6 +310,7 @@ jobs:
 
           find ${{steps.raw_report_data.outputs.download-path}}
           bundle exec ruby tools/dev/report_generation/support_matrix/generate.rb --allure-data ${{steps.raw_report_data.outputs.download-path}} > ./allure-report/support_matrix.html
+        working-directory: metasploit-framework
 
       - name: archive results
         if: always()