diff --git a/.github/workflows/automated-end-to-end-api.yaml b/.github/workflows/automated-end-to-end-api.yaml index 826bb18b4..0dae5e191 100644 --- a/.github/workflows/automated-end-to-end-api.yaml +++ b/.github/workflows/automated-end-to-end-api.yaml @@ -4,9 +4,7 @@ on: push: paths-ignore: - 'webroot/**' - pull_request: - paths-ignore: - - 'webroot/**' + - 'web/**' jobs: api: diff --git a/.github/workflows/javascript-formatting.yml b/.github/workflows/javascript-formatting.yml index d5e298b87..11d9fc33f 100644 --- a/.github/workflows/javascript-formatting.yml +++ b/.github/workflows/javascript-formatting.yml @@ -18,6 +18,7 @@ jobs: # Make sure the actual branch is checked out when running on pull requests ref: ${{ github.head_ref }} fetch-depth: 0 + pull: --rebase --autostash - name: Prettify code uses: creyD/prettier_action@v4.2