Merge pull request #35889 from nextcloud/artonge/fix/checkout_branch_…

…in_cypress_tests Checkout current branch in cypress tests in CI
nextcloud · Dec 27, 2022 · 30d2088 · 30d2088
2 parents c31e0e3 + 7a73219
commit 30d2088
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -83,6 +83,9 @@ export const startNextcloud = async function(branch: string = 'master'): Promise
 			HostConfig: {
 				Binds: [],
 			},
+			Env: [
+				`BRANCH=${branch}`,
+			]
 		})
 		await container.start()