diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml index 6363b4202..df05997b6 100644 --- a/.github/workflows/pull-request-approved.yml +++ b/.github/workflows/pull-request-approved.yml @@ -6,37 +6,6 @@ on: types: [ submitted ] jobs: - calculate-xetabase-branch: - if: github.event.review.state == 'approved' - name: Calculate Xetabase branch - runs-on: ubuntu-22.04 - outputs: - xetabase_branch: ${{ steps.get_xetabase_branch.outputs.xetabase_branch }} - steps: - - name: Clone java-common-libs - uses: actions/checkout@v4 - with: - fetch-depth: '10' - ## This is important to avoid the error in the next step: "fatal: repository 'https://github.com/zetta-genomics/opencga-enterprise.git/' not found" - persist-credentials: false - - id: get_xetabase_branch - name: "Get current branch for Xetabase from target branch" - run: | - chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh - echo "github.event.pull_request.base.ref: ${{ github.event.pull_request.base.ref }}" - echo "github.event.pull_request.head.ref: ${{ github.event.pull_request.head.ref }}" - xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }}) - echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} - echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT - env: - ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }} - test: - if: github.event.review.state == 'approved' - name: "Run all tests before merging" - needs: calculate-xetabase-branch - uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop - with: - branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }} - task: ${{ github.event.pull_request.head.ref }} + uses: ./.github/workflows/test-analysis.yml secrets: inherit \ No newline at end of file