Merge branch 'develop' into bugfix/programming-exercises/missing-branch

ls1intum · Sep 13, 2023 · 65bf224 · 65bf224
2 parents 6a1e73a + 4332d9e
commit 65bf224
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -115,9 +115,9 @@ jobs:
       if: ${{ github.event_name == 'release' }}
       uses: actions/checkout@v4
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
     # Build and Push to GitHub Container Registry
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v2

diff --git a/src/test/cypress/cypress.config.ts b/src/test/cypress/cypress.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig } from 'cypress';
 import { cloudPlugin } from 'cypress-cloud/plugin';
+import fs from 'fs';
 
 export default defineConfig({
     clientCertificates: [
@@ -38,7 +39,6 @@ export default defineConfig({
     screenshotsFolder: 'screenshots',
     videosFolder: 'videos',
     video: true,
-    videoUploadOnPasses: false,
     screenshotOnRunFailure: true,
     viewportWidth: 1920,
     viewportHeight: 1080,
@@ -65,6 +65,14 @@ export default defineConfig({
                     return null;
                 },
             });
+            on('after:spec', (spec: Cypress.Spec, results: CypressCommandLine.RunResult) => {
+                if (results && results.video) {
+                    const failures = results.tests.some((test) => test.attempts.some((attempt) => attempt.state === 'failed'));
+                    if (!failures) {
+                        fs.unlinkSync(results.video);
+                    }
+                }
+            });
             on('before:browser:launch', (browser, launchOptions) => {
                 launchOptions.args.push('--lang=en');
                 return launchOptions;

diff --git a/src/test/cypress/package-lock.json b/src/test/cypress/package-lock.json
diff --git a/src/test/cypress/package.json b/src/test/cypress/package.json
@@ -8,13 +8,13 @@
     ],
     "devDependencies": {
         "@4tw/cypress-drag-drop": "2.2.4",
-        "@types/node": "20.5.9",
-        "cypress": "13.1.0",
-        "cypress-cloud": "1.9.4",
+        "@types/node": "20.6.0",
+        "cypress": "13.2.0",
+        "cypress-cloud": "1.10.0-beta.4",
         "cypress-file-upload": "5.0.8",
         "cypress-wait-until": "2.0.1",
         "typescript": "5.2.2",
-        "uuid": "9.0.0",
+        "uuid": "9.0.1",
         "wait-on": "7.0.1"
     },
     "overrides": {
@@ -30,7 +30,7 @@
         "cypress:open": "cypress open",
         "cypress:run": "cypress run --browser=chrome",
         "cypress:setup": "cypress install && cypress run --quiet --spec init/ImportUsers.cy.ts",
-        "cypress:record:mysql": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (MySQL)\"",
+        "cypress:record:mysql": "npx cypress-cloud run --cloud-debug --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (MySQL)\"",
         "cypress:record:postgres": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (Postgres)\"",
         "update": "npm-upgrade"
     }