Skip to content

Commit

Permalink
Merge pull request #5464 from nextcloud/tmp/debug
Browse files Browse the repository at this point in the history
test(ci): Revert some cypress workflow changes
  • Loading branch information
juliushaertl committed Mar 12, 2024
2 parents 4af3e00 + fb85416 commit 1db021e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-approve-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1db021e

Please sign in to comment.