diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress-e2e.yml similarity index 97% rename from .github/workflows/cypress.yml rename to .github/workflows/cypress-e2e.yml index d0128db4900..2465a9234c9 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress-e2e.yml @@ -13,13 +13,13 @@ env: jobs: init: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: nodeVersion: ${{ steps.versions.outputs.nodeVersion }} npmVersion: ${{ steps.versions.outputs.npmVersion }} strategy: matrix: - server-versions: [ 'master' ] + server-versions: ['master'] steps: - name: Checkout server @@ -73,6 +73,7 @@ jobs: - name: Install node dependencies & build assistant app working-directory: apps/assistant run: | + composer install --no-dev npm ci npm run build @@ -83,14 +84,14 @@ jobs: path: ./ cypress: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: init strategy: fail-fast: false matrix: containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - php-versions: [ '8.1' ] + php-versions: ['8.1'] run-in-parallel: - false # only for PRs: ${{ !!github.head_ref }} diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 00b019613f5..6ea67d6d4da 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -21,7 +21,7 @@ concurrency: jobs: auto-approve-merge: - if: github.actor == 'dependabot[bot]' + if: github.actor == 'dependabot[bot]' || github.actor == 'renovate[bot]' runs-on: ubuntu-latest-low permissions: # for hmarr/auto-approve-action to approve PRs