From 29318ca2898e865df395b59aab9a23c595688233 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Sat, 22 Oct 2022 11:50:39 -0400 Subject: [PATCH 1/3] Disables the editor in staging --- config/staging.json | 2 +- gulp/bundler.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/staging.json b/config/staging.json index a826dca81..28b6f065b 100644 --- a/config/staging.json +++ b/config/staging.json @@ -7,7 +7,7 @@ "password": "" }, "inviteCodesActive": false, - "datGuiEditorEnabled": true, + "datGuiEditorEnabled": false, "aiToolsEnabled": true, "allCardsAvailable": true, "watchSectionMinCurrentVersionGameCount": 1, diff --git a/gulp/bundler.js b/gulp/bundler.js index cbf384ff8..4f7530595 100644 --- a/gulp/bundler.js +++ b/gulp/bundler.js @@ -24,8 +24,6 @@ import { opts, config, env, version, production, staging, development, } from './shared'; -const datGUIEditorEnabled = development || staging || config.get('datGuiEditorEnabled'); - const minify = composer(uglify, console); // Browserify options @@ -42,7 +40,7 @@ const bundlerOpts = { }; const entries = ['./app/index']; -if (datGUIEditorEnabled) { +if (config.get('datGuiEditorEnabled')) { entries.push('./app/tools/editor.coffee'); } From 76e469880d8f07fec51ef468b394a2ff3625577f Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Sat, 22 Oct 2022 11:52:48 -0400 Subject: [PATCH 2/3] Disables flaky test --- test/unit/sdk/cards/monthlies/month11.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/unit/sdk/cards/monthlies/month11.js b/test/unit/sdk/cards/monthlies/month11.js index 8395cdab2..6259ca755 100644 --- a/test/unit/sdk/cards/monthlies/month11.js +++ b/test/unit/sdk/cards/monthlies/month11.js @@ -49,6 +49,8 @@ describe('monthlies', () => { expect(maw1.hasActiveModifierClass(SDK.ModifierProvoke)).to.equal(true); }); + + /* Test disabled: Slow. it('expect elkowl to gain two random abilities', () => { for (let i = 0; i < 100; i++) { const player1Deck = [ @@ -89,6 +91,8 @@ describe('monthlies', () => { SDK.GameSession.reset(); } }); + */ + it('expect grove lion to give your general forcefield', () => { const gameSession = SDK.GameSession.getInstance(); const board = gameSession.getBoard(); From 7877536d0a623dbc3f201f4ef34e345e19e160e1 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Sat, 22 Oct 2022 11:53:25 -0400 Subject: [PATCH 3/3] Bumps to version 1.97.5 --- desktop/package.json | 2 +- package.json | 2 +- version.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index 6d45d7076..e5774742e 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -2,7 +2,7 @@ "name": "duelyst-desktop", "productName": "Duelyst", "license": "CC0-1.0", - "version": "1.97.4", + "version": "1.97.5", "main": "desktop.js", "dependencies": { "electron-debug": "^2.0.0", diff --git a/package.json b/package.json index f7c308394..771ee1241 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "open-duelyst", "license": "CC0-1.0", - "version": "1.97.4", + "version": "1.97.5", "engines": { "yarn": ">= 1.0.0" }, diff --git a/version.json b/version.json index e2d9c09e6..62820cfd9 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "1.97.4" + "version": "1.97.5" }