From 56c8b84d0866bcc59692fa90e7612695e1992b77 Mon Sep 17 00:00:00 2001 From: Matthew Hilton Date: Thu, 11 Dec 2025 14:21:55 +1000 Subject: [PATCH] [#151] Apply core patches before plugin install --- .github/plugin/setup/action.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/plugin/setup/action.yml b/.github/plugin/setup/action.yml index f35974f7..f3e43def 100644 --- a/.github/plugin/setup/action.yml +++ b/.github/plugin/setup/action.yml @@ -91,6 +91,15 @@ runs: echo "::endgroup::" shell: bash + - name: Install Core Patches + if: ${{ always() }} + # We should attempt to install a patch, and pass if there isnt one for the branch. + run: | + git config --global user.email "test@test.com" + git config --global user.name "Test" + ((test -f plugin/patch/${{ matrix.moodle-branch }}.diff && cd moodle && git am --whitespace=nowarn < ../plugin/patch/${{ matrix.moodle-branch }}.diff) || echo No patch found;) + shell: bash + - name: Install Moodle run: | # Install moodle commands @@ -104,15 +113,6 @@ runs: DB: ${{ matrix.database }} MOODLE_BRANCH: ${{ matrix.moodle-branch }} - - name: Install Core Patches - if: ${{ always() }} - # We should attempt to install a patch, and pass if there isnt one for the branch. - run: | - git config --global user.email "test@test.com" - git config --global user.name "Test" - ((test -f plugin/patch/${{ matrix.moodle-branch }}.diff && cd moodle && git am --whitespace=nowarn < ../plugin/patch/${{ matrix.moodle-branch }}.diff) || echo No patch found;) - shell: bash - - name: Run phplint if: ${{ always() && inputs.disable_phplint != 'true' }} run: moodle-plugin-ci phplint