From cb0ba3e008d0939d004569537a165b507569bf8c Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Mon, 27 Mar 2023 15:01:22 +0200
Subject: [PATCH] Do not stop docker in cypress workflow
Signed-off-by: Louis Chemineau <louis@chmn.me>
---
.github/workflows/cypress.yml | 2 +-
cypress.config.ts | 4 +++-
cypress/e2e/files_versions/version_restoration.cy.ts | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 90f9946d354..0967583ed2a 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -97,7 +97,7 @@ jobs:
- name: Upload NC logs
uses: actions/upload-artifact@v3
- if: ${{ matrix.containers != 'component' }}
+ if: ( success() || failure() ) && matrix.containers != 'component'
with:
name: nc_logs_${{ matrix.containers }}
path: nextcloud.log
diff --git a/cypress.config.ts b/cypress.config.ts
index b8cb90c5177..0fba6005dc2 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -71,7 +71,9 @@ export default defineConfig({
// Remove container after run
on('after:run', () => {
- stopNextcloud()
+ if (!process.env.CI) {
+ stopNextcloud()
+ }
})
// Before the browser launches
diff --git a/cypress/e2e/files_versions/version_restoration.cy.ts b/cypress/e2e/files_versions/version_restoration.cy.ts
index 0e09b0d8aa6..74bb82c2c2d 100644
--- a/cypress/e2e/files_versions/version_restoration.cy.ts
+++ b/cypress/e2e/files_versions/version_restoration.cy.ts
@@ -24,7 +24,7 @@ import { assertVersionContent, clickPopperAction, openVersionMenu, openVersionsP
function restoreVersion(index: number) {
openVersionMenu(index)
- clickPopperAction("Restore version")
+ clickPopperAction('Restore version')
}
describe('Versions restoration', () => {
--
GitLab