Merge branch 'release_23.2' into 26_magres_addition

muon-spectroscopy-computational-project · Feb 9, 2024 · 1b05118 · 1b05118
2 parents 0b89cbf + 1e84387
commit 1b05118
Show file tree

Hide file tree

Showing 375 changed files with 14,890 additions and 3,534 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -62,7 +62,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
           case "$TARGET_BRANCH" in
-              release_[[:digit:]][[:digit:]].[[:digit:]][[:digit:]]|master)
+              release_[[:digit:]][[:digit:]].[[:digit:]][[:digit:]] | release_[[:digit:]][[:digit:]].[[:digit:]] | master)
                   UPLOAD_DIR=$TARGET_BRANCH
                   ;;
               dev)

diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml
@@ -61,7 +61,7 @@ jobs:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-toolshed
       - name: Install dependencies
-        run: ./scripts/common_startup.sh --skip-client-build
+        run: ./scripts/common_startup.sh --dev-wheels --skip-client-build
         working-directory: 'galaxy root'
       - name: Build Frontend
         run: |

diff --git a/client/gulpfile.js b/client/gulpfile.js
@@ -120,6 +120,20 @@ function buildPlugins(callback, forceRebuild) {
             skipBuild = false;
         } else {
             if (fs.existsSync(hashFilePath)) {
+                const hashFileContent = fs.readFileSync(hashFilePath, "utf8").trim();
+                const isHash = /^[0-9a-f]{7,40}$/.test(hashFileContent); // Check for a 7 to 40 character hexadecimal string
+
+                if (!isHash) {
+                    console.log(`Hash file for ${pluginName} exists but does not have a valid git hash.`);
+                    skipBuild = false;
+                } else {
+                    skipBuild =
+                        child_process.spawnSync("git", ["diff", "--quiet", hashFileContent, "--", pluginDir], {
+                            stdio: "inherit",
+                            shell: true,
+                        }).status === 0;
+                }
+
                 skipBuild =
                     child_process.spawnSync("git", ["diff", "--quiet", `$(cat ${hashFilePath})`, "--", pluginDir], {
                         stdio: "inherit",

diff --git a/client/package.json b/client/package.json
@@ -43,7 +43,7 @@
     "@types/jest": "^29.5.6",
     "@vueuse/core": "^10.5.0",
     "assert": "^2.1.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.2",
     "babel-runtime": "^6.26.0",
     "backbone": "1.5.0",
     "bootstrap": "4.6",