Skip to content

Commit

Permalink
Merge pull request #3143 from nextcloud/skjnldsv-patch-1
Browse files Browse the repository at this point in the history
fix(cypress): cypress branch env
  • Loading branch information
skjnldsv authored Aug 28, 2024
2 parents 466f467 + 0e75041 commit f9e7f5d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ env:
# Adjust APP_NAME if your repository name is different
APP_NAME: ${{ github.event.repository.name }}

# Server requires head_ref instead of base_ref, as we want to test the PR branch
BRANCH: ${{ github.head_ref || github.ref_name }}
# This represents the server branch to checkout.
# Usually it's the base branch of the PR, but for pushes it's the branch itself.
# e.g. 'main', 'stable27' or 'feature/my-feature'
# n.b. server will use head_ref, as we want to test the PR branch.
BRANCH: ${{ github.base_ref || github.ref_name }}

jobs:
init:
Expand Down
6 changes: 5 additions & 1 deletion cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { configureNextcloud, startNextcloud, stopNextcloud, waitOnNextcloud } from '@nextcloud/cypress/docker'
import { defineConfig } from 'cypress'
import cypressSplit from 'cypress-split'
Expand Down Expand Up @@ -52,4 +56,4 @@ export default defineConfig({
return config
},
},
})
})

0 comments on commit f9e7f5d

Please sign in to comment.