diff --git a/.github/workflows/dymos_docs_workflow.yml b/.github/workflows/dymos_docs_workflow.yml index 766329fd4..c27c313ec 100644 --- a/.github/workflows/dymos_docs_workflow.yml +++ b/.github/workflows/dymos_docs_workflow.yml @@ -7,7 +7,7 @@ on: push: branches: [ master ] pull_request: - branches: [ master ] + branches: [ master, develop ] workflow_dispatch: jobs: @@ -44,7 +44,7 @@ jobs: SNOPT: 7.7 OPENMDAO: 'dev' OPTIONAL: '[docs]' - JAX: True + JAX: 'dev' PUBLISH_DOCS: 0 steps: @@ -105,8 +105,13 @@ jobs: echo "=============================================================" echo "Install jax" echo "=============================================================" - pip install jax - pip install jaxlib + if [[ "${{ matrix.JAX }}" == "dev" ]]; then + python -m pip install git+https://github.com/google/jax + elif [[ "${{ matrix.OPENMDAO }}" == "latest" || "${{ matrix.JAX }}" == "True" ]]; then + python -m pip install jax jaxlib + else + python -m pip install jax=${{ matrix.JAX }} jaxlib=${{ matrix.JAX }} + fi - name: Install PETSc if: (github.event_name != 'workflow_dispatch' || matrix.NAME == 'latest') && matrix.PETSc diff --git a/.github/workflows/dymos_tests_workflow.yml b/.github/workflows/dymos_tests_workflow.yml index c88e34840..78b5a73b2 100644 --- a/.github/workflows/dymos_tests_workflow.yml +++ b/.github/workflows/dymos_tests_workflow.yml @@ -10,7 +10,7 @@ on: push: branches: [ master ] pull_request: - branches: [ master ] + branches: [ master, develop ] workflow_dispatch: jobs: @@ -69,7 +69,7 @@ jobs: SNOPT: 7.7 OPENMDAO: 'dev' OPTIONAL: '[test]' - JAX: True + JAX: 'dev' DOCS: 0 # oldest supported versions @@ -144,8 +144,13 @@ jobs: echo "=============================================================" echo "Install jax" echo "=============================================================" - pip install jax - pip install jaxlib + if [[ "${{ matrix.JAX }}" == "dev" ]]; then + python -m pip install git+https://github.com/google/jax + elif [[ "${{ matrix.OPENMDAO }}" == "latest" || "${{ matrix.JAX }}" == "True" ]]; then + python -m pip install jax jaxlib + else + python -m pip install jax=${{ matrix.JAX }} jaxlib=${{ matrix.JAX }} + fi - name: Install PETSc if: (github.event_name != 'workflow_dispatch' || matrix.NAME == 'latest') && matrix.PETSc