From 68565e7eb6dd903d9e1f104aa308b947f5635070 Mon Sep 17 00:00:00 2001 From: Richard Murray Date: Sat, 24 Dec 2022 18:45:17 -0800 Subject: [PATCH 1/3] update workflow to pass jobname to python-control pytest --- .github/workflows/slycot-build-and-test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 9c68b243..7d931e82 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -283,7 +283,9 @@ jobs: pip install slycot-wheels/${{ matrix.packagekey }}/slycot*.whl pip show slycot - name: Slycot and python-control tests - run: bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + env: + JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -359,7 +361,9 @@ jobs: mamba install -c ./slycot-conda-pkgs slycot conda list - name: Slycot and python-control tests - run: bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + env: + JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 23c0093abc86a02d857d71043b3da35e7a324378 Mon Sep 17 00:00:00 2001 From: Richard Murray Date: Mon, 26 Dec 2022 07:51:47 -0800 Subject: [PATCH 2/3] add quotes to JOBNAME expansion --- .github/workflows/slycot-build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 7d931e82..1f45b719 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -283,7 +283,7 @@ jobs: pip install slycot-wheels/${{ matrix.packagekey }}/slycot*.whl pip show slycot - name: Slycot and python-control tests - run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage @@ -361,7 +361,7 @@ jobs: mamba install -c ./slycot-conda-pkgs slycot conda list - name: Slycot and python-control tests - run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage From 73f575e8c08cc114bb1fc21ad8c1927718d91928 Mon Sep 17 00:00:00 2001 From: Richard Murray Date: Mon, 26 Dec 2022 08:49:44 -0800 Subject: [PATCH 3/3] add build type to JOBNAME --- .github/workflows/slycot-build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 1f45b719..050a6097 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -285,7 +285,7 @@ jobs: - name: Slycot and python-control tests run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: - JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} + JOBNAME: wheel ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -363,7 +363,7 @@ jobs: - name: Slycot and python-control tests run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: - JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} + JOBNAME: conda ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}