diff --git a/desktop/scripts/release.build b/desktop/scripts/release.build index 920efc963..1c9d034d7 100644 --- a/desktop/scripts/release.build +++ b/desktop/scripts/release.build @@ -2,12 +2,14 @@ rm -rf build yarn setenv UI_ESBUILD_ARGS "--minify" setenv VERSION {arg0} +# Remove v prefix from version. v12 -> 12 +stripleft VERSION "v" yarn build-desktop prepend "window.DS_CONFIG_MODE='desktop';" build/ui.js -prepend "window.DS_CONFIG_VERSION='{arg0}';" build/ui.js -prepend "window.DS_CONFIG_VERSION='{arg0}';" build/desktop_runner.js -prepend "global.DS_CONFIG_VERSION='{arg0}';" build/desktop.js +prepend "window.DS_CONFIG_VERSION='{VERSION}';" build/ui.js +prepend "window.DS_CONFIG_VERSION='{VERSION}';" build/desktop_runner.js +prepend "global.DS_CONFIG_VERSION='{VERSION}';" build/desktop.js cp icon.png build/icon.png cp icon.ico build/icon.ico cp icon.icns build/icon.icns @@ -41,5 +43,5 @@ rm -rf releases yarn electron-rebuild # Build and package -yarn electron-packager --asar --overwrite --icon=build/icon.png --out=releases --build-version={arg0} --app-version={arg0} . "DataStation Desktop CE" -zip -9 -r releases/datastation-{os}-{arch}-{arg0}.zip "releases/DataStation Desktop CE-{os}-{arch}" \ No newline at end of file +yarn electron-packager --asar --overwrite --icon=build/icon.png --out=releases --build-version={VERSION} --app-version={VERSION} . "DataStation Desktop CE" +zip -9 -r releases/datastation-{os}-{arch}-{VERSION}.zip "releases/DataStation Desktop CE-{os}-{arch}" \ No newline at end of file diff --git a/integration/clickhouse.test.js b/integration/clickhouse.test.js index cd8acb709..8a6e5e654 100644 --- a/integration/clickhouse.test.js +++ b/integration/clickhouse.test.js @@ -1,7 +1,7 @@ const cp = require('child_process'); const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/cockroachdb.test.js b/integration/cockroachdb.test.js index a11069bdb..914b4f8ca 100644 --- a/integration/cockroachdb.test.js +++ b/integration/cockroachdb.test.js @@ -1,7 +1,7 @@ const cp = require('child_process'); const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/cratedb.test.js b/integration/cratedb.test.js index ef485446b..67d873da0 100644 --- a/integration/cratedb.test.js +++ b/integration/cratedb.test.js @@ -1,5 +1,5 @@ const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/testutil.js b/integration/docker.js similarity index 93% rename from integration/testutil.js rename to integration/docker.js index 4f7569322..87d641c60 100644 --- a/integration/testutil.js +++ b/integration/docker.js @@ -138,6 +138,12 @@ module.exports.withDocker = async function (opts, cb) { CONTAINERS[opts.image] = CONTAINERS[opts.image].filter( (c) => c === containerId ); + + if (process.env.CI == 'true') { + // Clear up disk space if possible since Github Actions doesn't + // have a massive disk. + cp.execSync('docker image prune -a', { stdio: 'inherit' }); + } } }; diff --git a/integration/elasticsearch.test.js b/integration/elasticsearch.test.js index 21bb95e9a..1603ed87c 100644 --- a/integration/elasticsearch.test.js +++ b/integration/elasticsearch.test.js @@ -6,7 +6,7 @@ const fetch = require('node-fetch'); const { getProjectResultsFile } = require('../desktop/store'); const { DatabasePanelInfo, DatabaseConnectorInfo } = require('../shared/state'); const { withSavedPanels, RUNNERS } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); describe('elasticsearch testdata/documents tests', () => { const tests = [ diff --git a/integration/influx.test.js b/integration/influx.test.js index 731d19cd3..0b14ba3ce 100644 --- a/integration/influx.test.js +++ b/integration/influx.test.js @@ -9,7 +9,7 @@ const { DatabaseConnectorInfo, } = require('../shared/state'); const { withSavedPanels, RUNNERS } = require('../desktop/panel/testutil'); -const { withDocker, DEFAULT_TIMEOUT } = require('./testutil'); +const { withDocker, DEFAULT_TIMEOUT } = require('./docker'); async function testBasicInflux(testcase) { const connectors = [ diff --git a/integration/mongo.test.js b/integration/mongo.test.js index 055fb0d15..f78fc3404 100644 --- a/integration/mongo.test.js +++ b/integration/mongo.test.js @@ -8,7 +8,7 @@ const { DatabaseConnectorInfo, } = require('../shared/state'); const { withSavedPanels, RUNNERS } = require('../desktop/panel/testutil'); -const { withDocker, DEFAULT_TIMEOUT } = require('./testutil'); +const { withDocker, DEFAULT_TIMEOUT } = require('./docker'); function testWithDocker(name, cb) { test( diff --git a/integration/mysql.test.js b/integration/mysql.test.js index 636bf0f17..64865d5fc 100644 --- a/integration/mysql.test.js +++ b/integration/mysql.test.js @@ -1,7 +1,7 @@ const cp = require('child_process'); const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/neo4j.test.js b/integration/neo4j.test.js index fe146d8c0..770a8c10b 100644 --- a/integration/neo4j.test.js +++ b/integration/neo4j.test.js @@ -7,7 +7,7 @@ const { DatabaseConnectorInfo, } = require('../shared/state'); const { withSavedPanels, RUNNERS } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); describe('basic neo4j tests', () => { test('basic test', async () => { diff --git a/integration/oracle.test.js b/integration/oracle.test.js index 5e8e3762d..eee8dbf00 100644 --- a/integration/oracle.test.js +++ b/integration/oracle.test.js @@ -1,5 +1,5 @@ const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker, DEFAULT_TIMEOUT } = require('./testutil'); +const { withDocker, DEFAULT_TIMEOUT } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/postgres.test.js b/integration/postgres.test.js index cddbf2629..717abd8aa 100644 --- a/integration/postgres.test.js +++ b/integration/postgres.test.js @@ -1,5 +1,5 @@ const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/prometheus.test.js b/integration/prometheus.test.js index 2166be5d7..1a4fe8a67 100644 --- a/integration/prometheus.test.js +++ b/integration/prometheus.test.js @@ -5,7 +5,7 @@ const fetch = require('node-fetch'); const { getProjectResultsFile } = require('../desktop/store'); const { DatabasePanelInfo, DatabaseConnectorInfo } = require('../shared/state'); const { withSavedPanels, RUNNERS } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); describe('basic prometheus tests', () => { test('basic test', async () => { diff --git a/integration/questdb.test.js b/integration/questdb.test.js index df1083829..a9b4998a4 100644 --- a/integration/questdb.test.js +++ b/integration/questdb.test.js @@ -1,5 +1,5 @@ const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/integration/scylla.test.js b/integration/scylla.test.js index 07e3caf9d..b4587b7ff 100644 --- a/integration/scylla.test.js +++ b/integration/scylla.test.js @@ -7,7 +7,7 @@ const { DatabaseConnectorInfo, } = require('../shared/state'); const { withSavedPanels, RUNNERS } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); describe('basic cassandra/scylladb tests', () => { test(`runs basic cql query`, async () => { diff --git a/integration/sqlserver.test.js b/integration/sqlserver.test.js index 89f5224c0..b431ff0b8 100644 --- a/integration/sqlserver.test.js +++ b/integration/sqlserver.test.js @@ -1,5 +1,5 @@ const { basicDatabaseTest } = require('../desktop/panel/testutil'); -const { withDocker } = require('./testutil'); +const { withDocker } = require('./docker'); const BASIC_TESTS = [ { diff --git a/scripts/build.py b/scripts/build.py index f009734ff..c102937a5 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -162,6 +162,11 @@ def eval_line(line): with open(to, 'a') as to: to.write('\n'+what) return + elif line[0] == 'stripleft': + var = line[1] + what = line[2] + os.environ[var] = os.environ[var].lstrip(what) + return elif line[0] == 'prepend': what = line[1] to = line[2]