simplified defaults

catalystneuro · Oct 22, 2024 · a76fc48 · a76fc48
1 parent eefe6db
commit a76fc48
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/deploy-tests.yml b/.github/workflows/deploy-tests.yml
@@ -40,17 +40,17 @@ jobs:
       S3_GIN_BUCKET: ${{ secrets.S3_GIN_BUCKET }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     with:  #  Ternary operator: condition && value_if_true || value_if_false
-      python-versions: ${{ github.event.pull_request.draft == true && '["3.9"]' || '' }}
-      os-versions: ${{ github.event.pull_request.draft == true && '["ubuntu-latest"]' || '' }}
+      python-versions: ${{ github.event.pull_request.draft == true && '["3.9"]' || vars.ALL_PYTHON_VERSIONS }}
+      os-versions: ${{ github.event.pull_request.draft == true && '["ubuntu-latest"]' || vars.ALL_OS_VERSIONS }}
 
   # If the conversion gallery is the only thing that changed, run doctests only
   run-doctests-only:
     needs: assess-file-changes
     if: ${{ needs.assess-file-changes.outputs.CONVERSION_GALLERY_CHANGED == 'true' && needs.assess-file-changes.outputs.SOURCE_CHANGED != 'true' }}
     uses: ./.github/workflows/doctests.yml
     with:  #  Ternary operator: condition && value_if_true || value_if_false
-      python-versions: ${{ github.event.pull_request.draft == true && '["3.9"]' || '' }}
-      os-versions: ${{ github.event.pull_request.draft == true && '["ubuntu-latest"]' || '' }}
+      python-versions: ${{ github.event.pull_request.draft == true && '["3.9"]' || vars.ALL_PYTHON_VERSIONS }}
+      os-versions: ${{ github.event.pull_request.draft == true && '["ubuntu-latest"]' || vars.ALL_OS_VERSIONS }}
 
 
   run-live-service-tests:
@@ -60,8 +60,8 @@ jobs:
     secrets:
       DANDI_API_KEY: ${{ secrets.DANDI_API_KEY }}
     with:  #  Ternary operator: condition && value_if_true || value_if_false
-      python-versions: ${{ github.event.pull_request.draft == true && '["3.9"]' || '' }}
-      os-versions: ${{ github.event.pull_request.draft == true && '["ubuntu-latest"]' || '' }}
+      python-versions: ${{ github.event.pull_request.draft == true && '["3.9"]' || vars.ALL_PYTHON_VERSIONS }}
+      os-versions: ${{ github.event.pull_request.draft == true && '["ubuntu-latest"]' || vars.ALL_OS_VERSIONS }}
 
 
   check-final-status:

diff --git a/.github/workflows/dev-testing.yml b/.github/workflows/dev-testing.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ${{ fromJson(!inputs.python-versions && vars.ALL_PYTHON_VERSIONS || inputs.python-versions) }}
+        python-version: ${{ fromJson(inputs.python-versions) }}
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags

diff --git a/.github/workflows/doctests.yml b/.github/workflows/doctests.yml
@@ -21,8 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ${{ fromJson(!inputs.python-versions && vars.ALL_PYTHON_VERSIONS || inputs.python-versions) }}
-        os: ${{ fromJson(!inputs.os-versions && vars.ALL_OS_VERSIONS || inputs.os-versions) }}
+        python-version: ${{ fromJson(inputs.python-versions) }}
+        os: ${{ fromJson(inputs.os-versions) }}
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags

diff --git a/.github/workflows/live-service-testing.yml b/.github/workflows/live-service-testing.yml
@@ -28,8 +28,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ${{ fromJson(!inputs.python-versions && vars.ALL_PYTHON_VERSIONS || inputs.python-versions) }}
-        os: ${{ fromJson(!inputs.os-versions && vars.ALL_OS_VERSIONS || inputs.os-versions) }}
+        python-version: ${{ fromJson(inputs.python-versions) }}
+        os: ${{ fromJson(inputs.os-versions) }}
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -33,8 +33,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ${{ fromJson(!inputs.python-versions && vars.ALL_PYTHON_VERSIONS || inputs.python-versions) }}
-        os: ${{ fromJson(!inputs.os-versions && vars.ALL_OS_VERSIONS || inputs.os-versions) }}
+        python-version: ${{ fromJson(inputs.python-versions) }}
+        os: ${{ fromJson(inputs.os-versions) }}
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags