From aed1aad7ffa863b2d0ebbfc6ac329252353ee3ac Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 21 Dec 2021 09:17:24 +0100
Subject: [PATCH] fix: use stable21 branch for cypress tests

On CI we want to test this with the stable21 branch of the server.
Also make sure to use the specified node version.

For running local the server image will use the BRANCH environment variable
to determine which branch of the server to checkout:
https://github.com/nextcloud/docker-ci/blob/master/server/initnc.sh#L3-L12

Signed-off-by: Azul <azul@riseup.net>
---
 .github/workflows/cypress.yml | 10 +++++++++-
 cypress/Dockerfile            |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 025180072d2..8bee0f45f95 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -18,9 +18,17 @@ jobs:
         # containers: [1, 2, 3]
         php-versions: [ '7.4' ]
         databases: [ 'sqlite' ]
-        server-versions: [ 'master' ]
+        server-versions: [ 'stable21' ]
 
     steps:
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Set up npm7
+        run: npm i -g npm@7
+            
       - name: Checkout server
         uses: actions/checkout@v2
         with:
diff --git a/cypress/Dockerfile b/cypress/Dockerfile
index 4f2fc4495c7..9ccaeeef54f 100644
--- a/cypress/Dockerfile
+++ b/cypress/Dockerfile
@@ -2,6 +2,7 @@ FROM nextcloudci/server:server-17
 
 RUN mkdir /var/www/html/data
 RUN chown -R www-data:www-data /var/www/html/data
+ENV BRANCH stable21
 
 ENTRYPOINT /usr/local/bin/initAndRun.sh