summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/cypress.yml4
-rw-r--r--cypress/dockerNode.ts3
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()