Fix artifact paths

deltachat · Dec 5, 2024 · c07fa27 · c07fa27
1 parent 9b1ebb5
commit c07fa27
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -46,5 +46,5 @@ jobs:
       if: ${{ !cancelled() }}
       with:
         name: e2e-report
-        path: e2e-report/
+        path: packages/e2e-tests/playwright-report/ packages/e2e-tests/test-results/
         retention-days: 30
diff --git a/packages/e2e-tests/playwright-helper.ts b/packages/e2e-tests/playwright-helper.ts
@@ -145,6 +145,7 @@ export async function loadExistingProfiles(page: Page): Promise<User[]> {
   const existingProfiles: User[] = []
   const accountList = page.locator('.styles_module_account')
   const existingAccountItems = await accountList.count()
+  console.log('existingAccountItems', existingAccountItems)
   if (existingAccountItems > 0) {
     if (existingAccountItems === 1) {
       const welcomeDialog = await page

diff --git a/packages/target-browser/src/index.ts b/packages/target-browser/src/index.ts
@@ -191,10 +191,24 @@ app.get('/themes.json', async (req, res) => {
   res.json(await readThemeDir())
 })
 
+let certificate = ''
+if (process.env.PRIVATE_CERTIFICATE_CERT) {
+  certificate = process.env.PRIVATE_CERTIFICATE_CERT
+} else {
+  certificate = await readFile(PRIVATE_CERTIFICATE_CERT, 'utf8')
+}
+
+let certificateKey = ''
+if (process.env.PRIVATE_CERTIFICATE_KEY) {
+  certificateKey = process.env.PRIVATE_CERTIFICATE_KEY
+} else {
+  certificateKey = await readFile(PRIVATE_CERTIFICATE_KEY, 'utf8')
+}
+
 const sslserver = https.createServer(
   {
-    key: process.env.PRIVATE_CERTIFICATE_KEY,
-    cert: process.env.PRIVATE_CERTIFICATE_CERT,
+    key: certificateKey,
+    cert: certificate,
   },
   app
 )