From 5596a641baeb6253b6f2b4286d2adfc48cb65980 Mon Sep 17 00:00:00 2001 From: Meagan Lang Date: Thu, 8 Feb 2024 18:37:48 -0500 Subject: [PATCH] Fix output name --- .github/workflows/test-install.yml | 15 ++++++++++++--- utils/test-install-base.yml | 6 +++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 6d1dce562..9d5bfa434 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -224,15 +224,24 @@ jobs: name: Prepare test parameters outputs: os-versions: ${{ steps.set-os-versions.outputs.versions }} - test-flags: ${{ steps.set-test-flags.outputs.versions }} + test-flags: ${{ steps.set-test-flags.outputs.testflags }} runs-on: ubuntu-latest steps: - id: set-os-versions run: echo "versions={\"ubuntu\":\"latest\", \"macos\":\"latest\", \"windows\":\"latest\"}" >> $GITHUB_OUTPUT - id: set-test-flags - run: echo "test-flags={\"empty\":\"\", \"basic\":\"--long-running --suites timing - demos top\"}" >> $GITHUB_OUTPUT + run: echo "testflags={\"empty\":\"\", \"basic\":\"--long-running --suites timing + demos top\", \"examples\":\"--suite=examples --extra-examples --mpi-script=run_mpi.sh + --mpi-nproc=3\", \"types-no-c\":\"--suite=types --skip-languages c cpp\", + \"types-c\":\"--suite=types --languages c cpp\", \"long\":\"--long-running\", + \"long-mpi\":\"--long-running --mpi-script=run_mpi.sh\", \"examples-backwards\":\"--suite=examples + --parametrize-example-name=backwards\", \"examples-sbml\":\"--suites examples + --parametrize-language=sbml\", \"long-remote-service\":\"--long-running --remote-service\", + \"examples-rpc-lesson3\":\"--suites examples top --parametrize-example-name=rpc_lesson3\", + \"tools\":\"tests/test_tools.py\", \"long-interp\":\"--long-running --languages + python R matlab\", \"services\":\"tests/test_services.py --nocapture\"}" >> + $GITHUB_OUTPUT schema: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') name: Update the schema used by the model submission form diff --git a/utils/test-install-base.yml b/utils/test-install-base.yml index f5bad9054..8381b3f97 100644 --- a/utils/test-install-base.yml +++ b/utils/test-install-base.yml @@ -40,13 +40,13 @@ jobs: runs-on: ubuntu-latest outputs: os-versions: ${{ steps.set-os-versions.outputs.versions }} - test-flags: ${{ steps.set-test-flags.outputs.versions }} + test-flags: ${{ steps.set-test-flags.outputs.testflags }} steps: - id: set-os-versions run: echo "versions={\"ubuntu\":\"latest\", \"macos\":\"latest\", \"windows\":\"latest\"}" >> $GITHUB_OUTPUT - id: set-test-flags - run: echo "test-flags={\"empty\":\"\", \"basic\":\"--long-running --suites timing demos top\"}" >> $GITHUB_OUTPUT - # run: echo "test-flags={\"empty\":\"\", \"basic\":\"--long-running --suites timing demos top\", \"examples\":\"--suite=examples --extra-examples --mpi-script=run_mpi.sh --mpi-nproc=3\", \"types-no-c\":\"--suite=types --skip-languages c cpp\", \"types-c\":\"--suite=types --languages c cpp\", \"long\":\"--long-running\", \"long-mpi\":\"--long-running --mpi-script=run_mpi.sh\", \"examples-backwards\":\"--suite=examples --parametrize-example-name=backwards\", \"examples-sbml\":\"--suites examples --parametrize-language=sbml\", \"long-remote-service\":\"--long-running --remote-service\", \"examples-rpc-lesson3\":\"--suites examples top --parametrize-example-name=rpc_lesson3\", \"tools\":\"tests/test_tools.py\", \"long-interp\":\"--long-running --languages python R matlab\", \"services\":\"tests/test_services.py --nocapture\"}" >> $GITHUB_OUTPUT + # run: echo "testflags={\"empty\":\"\", \"basic\":\"--long-running --suites timing demos top\"}" >> $GITHUB_OUTPUT + run: echo "testflags={\"empty\":\"\", \"basic\":\"--long-running --suites timing demos top\", \"examples\":\"--suite=examples --extra-examples --mpi-script=run_mpi.sh --mpi-nproc=3\", \"types-no-c\":\"--suite=types --skip-languages c cpp\", \"types-c\":\"--suite=types --languages c cpp\", \"long\":\"--long-running\", \"long-mpi\":\"--long-running --mpi-script=run_mpi.sh\", \"examples-backwards\":\"--suite=examples --parametrize-example-name=backwards\", \"examples-sbml\":\"--suites examples --parametrize-language=sbml\", \"long-remote-service\":\"--long-running --remote-service\", \"examples-rpc-lesson3\":\"--suites examples top --parametrize-example-name=rpc_lesson3\", \"tools\":\"tests/test_tools.py\", \"long-interp\":\"--long-running --languages python R matlab\", \"services\":\"tests/test_services.py --nocapture\"}" >> $GITHUB_OUTPUT test_pip: needs: params name: Test (${{ matrix.python-version }}, ${{ matrix.os-base }}, ${{ matrix.install-method }}, ${{ matrix.test-flags1 }}, ${{ matrix.test-flags2 }}), Install C = ${{ matrix.install-c }}