Merge pull request #1467 from nextcloud/feat/cypress-faster-without-pull

Do not pull from the github workflow
nextcloud · Nov 15, 2022 · aaeab95 · aaeab95
2 parents 648ed24 + 9deaef3
commit aaeab95
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -67,9 +67,6 @@ jobs:
           key: cypress-context-${{ github.run_id }}
           path: /home/runner/work/viewer
 
-      - name: Pull server image
-        run: docker pull ghcr.io/nextcloud/continuous-integration-shallow-server
-
       - name: Run E2E cypress tests
         uses: cypress-io/github-action@v4
         with:

diff --git a/cypress/dockerNode.ts b/cypress/dockerNode.ts
@@ -39,8 +39,19 @@ const SERVER_IMAGE = 'ghcr.io/nextcloud/continuous-integration-shallow-server'
 export const startNextcloud = async function (branch: string = 'master'): Promise<any> {
 	try {
 		// Pulling images
-		console.log('Pulling images...')
-		await docker.pull(SERVER_IMAGE)
+		console.log('Pulling images... ⏳')
+		await new Promise((resolve, reject): any => docker.pull(SERVER_IMAGE, (err, stream) => {
+			// https://github.com/apocas/dockerode/issues/357
+			docker.modem.followProgress(stream, onFinished)
+			function onFinished(err, output) {
+				if (!err) {
+					resolve(true)
+					return
+				}
+				reject(err)
+			}
+		}))
+		console.log(`└─ Done`)
 
 		// Getting latest image
 		console.log('\nChecking running containers... 🔍')