diff options
| author | Louis <6653109+artonge@users.noreply.github.com> | 2022-12-27 14:32:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-27 14:32:46 +0100 |
| commit | 30d2088c125078e9352d2c339aa5772c761efc06 (patch) | |
| tree | a758430a4a322b6da989a40828eddcab860a86be | |
| parent | c31e0e3f45ce5fd70d4f74b8cb7a0a0a445ad5a3 (diff) | |
| parent | 7a73219412a675f5ad068d90f8654b723482a053 (diff) | |
| download | nextcloud-server-30d2088c125078e9352d2c339aa5772c761efc06.tar.gz nextcloud-server-30d2088c125078e9352d2c339aa5772c761efc06.zip | |
Merge pull request #35889 from nextcloud/artonge/fix/checkout_branch_in_cypress_tests
Checkout current branch in cypress tests in CI
| -rw-r--r-- | .github/workflows/cypress.yml | 4 | ||||
| -rw-r--r-- | cypress/dockerNode.ts | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index c9579238540..1036e67b51d 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -9,7 +9,7 @@ on: env: APP_NAME: viewer - BRANCH: ${{ github.base_ref }} + BRANCH: ${{ github.ref }} TESTING: true jobs: @@ -30,7 +30,7 @@ jobs: - name: Set up node ${{ steps.versions.outputs.nodeVersion }} uses: actions/setup-node@v3 with: - cache: 'npm' + cache: "npm" node-version: ${{ steps.versions.outputs.nodeVersion }} - name: Set up npm ${{ steps.versions.outputs.npmVersion }} diff --git a/cypress/dockerNode.ts b/cypress/dockerNode.ts index 13e75c605b2..93b228c4460 100644 --- a/cypress/dockerNode.ts +++ b/cypress/dockerNode.ts @@ -83,6 +83,9 @@ export const startNextcloud = async function(branch: string = 'master'): Promise HostConfig: { Binds: [], }, + Env: [ + `BRANCH=${branch}`, + ] }) await container.start() |