From 3079721ca96768df8aa5a3603499b48f5fc25cf3 Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Sun, 16 Feb 2025 16:17:09 -0800 Subject: [PATCH 1/3] CI: explicitly include defaults channel This change is motivated by that of commit 814f4143ab7b0d083d4a8d2f2a29a07d7813400d --- .github/workflows/os-blas-test-matrix.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml index 242d89732..3b62332b8 100644 --- a/.github/workflows/os-blas-test-matrix.yml +++ b/.github/workflows/os-blas-test-matrix.yml @@ -126,6 +126,7 @@ jobs: activate-environment: build-env environment-file: .github/conda-env/build-env.yml miniforge-version: latest + channels: conda-forge,defaults channel-priority: strict auto-update-conda: false auto-activate-base: false @@ -297,6 +298,7 @@ jobs: miniforge-version: latest activate-environment: test-env environment-file: .github/conda-env/test-env.yml + channels: conda-forge,defaults channel-priority: strict auto-activate-base: false - name: Download conda packages From 9b228b16463cc35af6c1af10c0d70a34fd6b4bf3 Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Sun, 16 Feb 2025 21:34:11 -0800 Subject: [PATCH 2/3] CI: fix missing import --- .github/scripts/set-conda-test-matrix.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py index 69ef0a57e..6bcd0fa6f 100644 --- a/.github/scripts/set-conda-test-matrix.py +++ b/.github/scripts/set-conda-test-matrix.py @@ -1,6 +1,8 @@ """Create test matrix for conda packages in OS/BLAS test matrix workflow.""" +import json from pathlib import Path +import re osmap = {'linux': 'ubuntu', 'osx': 'macos', From 6c628f048e7382965ec70aa01b447000dee3df9d Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Sun, 16 Feb 2025 23:33:59 -0800 Subject: [PATCH 3/3] CI: detect errors from set-...-test-matrix scripts --- .github/workflows/os-blas-test-matrix.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml index 3b62332b8..263afb7a4 100644 --- a/.github/workflows/os-blas-test-matrix.yml +++ b/.github/workflows/os-blas-test-matrix.yml @@ -171,7 +171,10 @@ jobs: name: slycot-wheels path: slycot-wheels - id: set-matrix - run: echo "matrix=$(python3 .github/scripts/set-pip-test-matrix.py)" >> $GITHUB_OUTPUT + run: | + TEMPFILE="$(mktemp)" + python3 .github/scripts/set-pip-test-matrix.py | tee $TEMPFILE + echo "matrix=$(cat $TEMPFILE)" >> $GITHUB_OUTPUT create-conda-test-matrix: @@ -195,7 +198,10 @@ jobs: name: slycot-conda-pkgs path: slycot-conda-pkgs - id: set-matrix - run: echo "matrix=$(python3 .github/scripts/set-conda-test-matrix.py)" >> $GITHUB_OUTPUT + run: | + TEMPFILE="$(mktemp)" + python3 .github/scripts/set-conda-test-matrix.py | tee $TEMPFILE + echo "matrix=$(cat $TEMPFILE)" >> $GITHUB_OUTPUT test-wheel: