Merge branch 'release_24.1' into dev

galaxyproject · Oct 10, 2024 · 385a586 · 385a586
2 parents 0409898 + dd9ca09
commit 385a586
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/test_galaxy_packages_for_pulsar.yaml b/.github/workflows/test_galaxy_packages_for_pulsar.yaml
@@ -16,7 +16,7 @@ concurrency:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04  # Python 3.7 is not available via setup-python on ubuntu >=24.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/client/src/components/Form/Elements/FormData/FormData.vue b/client/src/components/Form/Elements/FormData/FormData.vue
@@ -411,7 +411,7 @@ function onBrowse() {
 }
 
 function canAcceptDatatype(itemDatatypes: string | Array<string>) {
-    if (!(props.extensions?.length > 0)) {
+    if (!(props.extensions?.length > 0) || props.extensions.includes("data")) {
         return true;
     }
     let datatypes: Array<string>;