From 4ec7fe32661ce614296bced835bcbce07e426ab9 Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Mon, 4 Dec 2023 13:14:21 -0800 Subject: [PATCH] =?UTF-8?q?wip:=20=F0=9F=9A=A7=20create=2012.4.0=20test=20?= =?UTF-8?q?builds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build-and-deploy-linux.yml | 1 + .github/workflows/Build-and-deploy-mac.yml | 2 ++ .github/workflows/Build-and-deploy-win.yml | 1 + package-lock.json | 4 ++-- package.json | 2 +- pyflask/startup/minimumApiVersion.py | 2 +- scripts/guided-mode/guided-curate-dataset.js | 1 + scripts/others/update-path-darwin.js | 1 - scripts/utils/swal-utils.js | 2 +- 9 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Build-and-deploy-linux.yml b/.github/workflows/Build-and-deploy-linux.yml index b88f09a36..bc37b5477 100644 --- a/.github/workflows/Build-and-deploy-linux.yml +++ b/.github/workflows/Build-and-deploy-linux.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - staging jobs: deploy-on-linux: diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index 532132205..2e37fb83d 100644 --- a/.github/workflows/Build-and-deploy-mac.yml +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -5,6 +5,8 @@ on: push: branches: - main + - staging + jobs: deploy-on-mac: runs-on: macos-latest diff --git a/.github/workflows/Build-and-deploy-win.yml b/.github/workflows/Build-and-deploy-win.yml index 670cd9c3f..b382317c5 100644 --- a/.github/workflows/Build-and-deploy-win.yml +++ b/.github/workflows/Build-and-deploy-win.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - staging jobs: deploy-on-windows: diff --git a/package-lock.json b/package-lock.json index 81559414f..a53b5363a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "soda-for-sparc", - "version": "12.4.5-beta", + "version": "12.4.0-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "soda-for-sparc", - "version": "12.4.5-beta", + "version": "12.4.0-beta", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index ee121acf6..b5ae058e3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "soda-for-sparc", "productName": "SODA for SPARC", - "version": "12.4.5-beta", + "version": "12.4.0-beta", "description": "Keep Calm and Curate ", "main": "main.js", "scripts": { diff --git a/pyflask/startup/minimumApiVersion.py b/pyflask/startup/minimumApiVersion.py index 4c0f2367d..8c0adddd3 100644 --- a/pyflask/startup/minimumApiVersion.py +++ b/pyflask/startup/minimumApiVersion.py @@ -4,4 +4,4 @@ def get_api_version(): """ Returns the version of the API """ - return {'version': os.getenv('API_VERSION', "12.4.5-beta")} + return {'version': os.getenv('API_VERSION', "12.4.0-beta")} diff --git a/scripts/guided-mode/guided-curate-dataset.js b/scripts/guided-mode/guided-curate-dataset.js index 316ae4930..fcb472a44 100644 --- a/scripts/guided-mode/guided-curate-dataset.js +++ b/scripts/guided-mode/guided-curate-dataset.js @@ -11851,6 +11851,7 @@ const guidedOpenEntityAdditionSwal = async (entityName) => { showConfirmButton: true, showCancelButton: true, showCloseButton: false, + allowOutsideClick: false, confirmButtonText: `Confirm`, cancelButtonText: `Cancel`, didOpen: () => { diff --git a/scripts/others/update-path-darwin.js b/scripts/others/update-path-darwin.js index 3b6b430f1..316800d0b 100644 --- a/scripts/others/update-path-darwin.js +++ b/scripts/others/update-path-darwin.js @@ -6,7 +6,6 @@ */ const fixPath = () => { if (process.platform == "darwin") { - process.env.PATH = [ "./node_modules/.bin", "/.nodebrew/current/bin", diff --git a/scripts/utils/swal-utils.js b/scripts/utils/swal-utils.js index 0916ddebc..ecb8f60e3 100644 --- a/scripts/utils/swal-utils.js +++ b/scripts/utils/swal-utils.js @@ -182,4 +182,4 @@ const swalConfirmAction = async (title, text, confirmButtonText, cancelButtonTex cancelButtonText: cancelButtonText, }); return action; -}; \ No newline at end of file +};