wip: 🚧 create 12.4.0 test builds

fairdataihub · Dec 4, 2023 · 4ec7fe3 · 4ec7fe3
1 parent c70e32c
commit 4ec7fe3
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - staging
 
 jobs:
   deploy-on-windows:

diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -182,4 +182,4 @@ const swalConfirmAction = async (title, text, confirmButtonText, cancelButtonTex
     cancelButtonText: cancelButtonText,
   });
   return action;
-};
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
       push:
         branches:
           - main
+          - staging
     jobs:
       deploy-on-linux:
@@ Expand Down @@