From db83c3429444d70e6ef58818570eb932317528e9 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Fri, 17 Jan 2025 09:38:50 -0800 Subject: [PATCH 1/2] Use separate conda cache directories in CI --- .github/workflows/build_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 576509125..b9b7640cc 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -44,7 +44,7 @@ jobs: # Increase this value to reset cache if dev-spec and setup.py have not changed in the workflow CACHE_NUMBER: 0 with: - path: ~/conda_pkgs_dir + path: ~/conda_pkgs_dir_py${{ matrix.python-version }} key: ${{ runner.os }}-${{ matrix.python-version }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('conda_package/dev-spec.txt,conda_package/setup.py') }} From 9dcd8f4cab039b51fdfbd085ad8fb823173f0e4a Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Fri, 17 Jan 2025 09:39:04 -0800 Subject: [PATCH 2/2] Switch python version in CI to var --- .github/workflows/docs_workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs_workflow.yml b/.github/workflows/docs_workflow.yml index a060fc2cd..9a00f9683 100644 --- a/.github/workflows/docs_workflow.yml +++ b/.github/workflows/docs_workflow.yml @@ -8,6 +8,9 @@ on: release: types: [published] +env: + PYTHON_VERSION: "3.10" + jobs: publish-docs: runs-on: ubuntu-latest @@ -40,7 +43,7 @@ jobs: channels: conda-forge channel-priority: strict auto-update-conda: true - python-version: ${{ matrix.python-version }} + python-version: ${{ env.PYTHON_VERSION }} - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Install mpas_tools