From 202f790697a64599f3383778a89d5cbacb3466dc Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Sun, 24 Mar 2024 16:34:57 +0000 Subject: [PATCH 1/3] Make sure to make the CSV file readable for others Signed-off-by: Stefan Marr --- src/backend/db/db.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/db/db.ts b/src/backend/db/db.ts index d6cdee2d..ce811966 100644 --- a/src/backend/db/db.ts +++ b/src/backend/db/db.ts @@ -837,7 +837,7 @@ export abstract class Database { runId, trialId, cmdline, invocation, iteration, criterion ) SELECT * FROM results WHERE value is NOT NULL - ) TO PROGRAM 'gzip -9 > ${outputFile}' + ) TO PROGRAM 'gzip -9 > ${outputFile} && chmod go+r ${outputFile}' WITH (FORMAT csv, HEADER true)`; const result = await this.query({ text: query From b99a55d487467539f767d2fced365020cda61661 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Sun, 24 Mar 2024 16:35:32 +0000 Subject: [PATCH 2/3] Use the dataExportUrlBase to redirect the data request The other one only incidentally worked with the integration tests, but not in production. Signed-off-by: Stefan Marr --- src/backend/project/data-export.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/project/data-export.ts b/src/backend/project/data-export.ts index 90db1fd5..f2798020 100644 --- a/src/backend/project/data-export.ts +++ b/src/backend/project/data-export.ts @@ -34,7 +34,7 @@ export async function getExpData( if (existsSync(`${siteConfig.dataExportPath}/${expFileName}`)) { data.preparingData = false; - data.downloadUrl = `${siteConfig.staticUrl}/${expFileName}`; + data.downloadUrl = `${siteConfig.dataExportUrlBase}/${expFileName}`; } else { const expRequestId = `${expFilePrefix}-${format}`; data.currentTime = new Date().toISOString(); From d0312fbc2598e459962b2f8eadc59b60d335c6db Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Sun, 24 Mar 2024 16:40:15 +0000 Subject: [PATCH 3/3] Set DATA_URL_BASE for integration test Signed-off-by: Stefan Marr --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07148829..dcfb1064 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ jobs: chmod a+wx ${{ github.workspace }} # start ReBenchDB server - NODE_DATA_EXPORT_PATH=${{ github.workspace }} RDB_DATA_EXPORT_PATH=/postgres-export DEV=true npm run start & + NODE_DATA_EXPORT_PATH=${{ github.workspace }} RDB_DATA_EXPORT_PATH=/postgres-export DATA_URL_BASE=/static DEV=true npm run start & sleep 5 # run integration tests