From de33c1448b6780e79694ef6e195b2ce47049f72c Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Oct 2024 13:28:24 +0100 Subject: [PATCH 1/5] try pin conda lock momentarily --- .github/workflows/create-condalock-file.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml index 7e1431f56f..8ea6c76e35 100644 --- a/.github/workflows/create-condalock-file.yml +++ b/.github/workflows/create-condalock-file.yml @@ -4,9 +4,10 @@ on: # Trigger on push on main or other branch for testing # NOTE that push: main will create the file very often # and hence lots of automated PRs - # push: - # branches: + push: + branches: # - main + - pin_conda-lock schedule: - cron: '0 4 */10 * *' @@ -47,7 +48,7 @@ jobs: which python python --version - name: Install conda-lock - run: mamba install -y -c conda-forge conda-lock + run: mamba install -y -c conda-forge "conda-lock<2.5.7" - name: Check version of conda-lock run: conda-lock --version - name: Create conda lock file for linux-64 From 0f4e21a633c16635cc916134b34893338a9e8276 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Oct 2024 15:56:36 +0100 Subject: [PATCH 2/5] get rid of Mambaforge and apply Ben's suggestions --- .github/workflows/create-condalock-file.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml index 8ea6c76e35..5ea907dcd6 100644 --- a/.github/workflows/create-condalock-file.yml +++ b/.github/workflows/create-condalock-file.yml @@ -10,6 +10,7 @@ on: - pin_conda-lock schedule: - cron: '0 4 */10 * *' +workflow_dispatch: # Required shell entrypoint to have properly configured bash shell defaults: @@ -30,7 +31,6 @@ jobs: activate-environment: esmvaltool-fromlock python-version: "3.12" miniforge-version: "latest" - miniforge-variant: Mambaforge use-mamba: true - name: Show conda config run: | @@ -38,7 +38,7 @@ jobs: conda --version # setup-miniconda@v3 installs an old conda and mamba # forcing a modern mamba updates both mamba and conda - conda install -c conda-forge "mamba>=1.4.8" + conda install -c conda-forge "mamba>=1.4.8,<2" conda config --show-sources conda config --show conda --version From 8c235f6be3b8feffa7a1d4098506400b14df3d06 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Oct 2024 15:58:49 +0100 Subject: [PATCH 3/5] unpin conda-lock at install point --- .github/workflows/create-condalock-file.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml index 5ea907dcd6..c5b2fe7c5f 100644 --- a/.github/workflows/create-condalock-file.yml +++ b/.github/workflows/create-condalock-file.yml @@ -48,7 +48,7 @@ jobs: which python python --version - name: Install conda-lock - run: mamba install -y -c conda-forge "conda-lock<2.5.7" + run: mamba install -y -c conda-forge conda-lock - name: Check version of conda-lock run: conda-lock --version - name: Create conda lock file for linux-64 From d764569fdf2d017a1abcdfc971f950829bedd5c3 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Oct 2024 16:05:24 +0100 Subject: [PATCH 4/5] fix workflow file --- .github/workflows/create-condalock-file.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml index c5b2fe7c5f..7024ee300c 100644 --- a/.github/workflows/create-condalock-file.yml +++ b/.github/workflows/create-condalock-file.yml @@ -10,7 +10,6 @@ on: - pin_conda-lock schedule: - cron: '0 4 */10 * *' -workflow_dispatch: # Required shell entrypoint to have properly configured bash shell defaults: From 6613f878e7dff9f2cc077daca564dab025b01701 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Oct 2024 16:49:39 +0100 Subject: [PATCH 5/5] unrun GA and add note why the pin --- .github/workflows/create-condalock-file.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml index 7024ee300c..4ae10de3e2 100644 --- a/.github/workflows/create-condalock-file.yml +++ b/.github/workflows/create-condalock-file.yml @@ -4,10 +4,9 @@ on: # Trigger on push on main or other branch for testing # NOTE that push: main will create the file very often # and hence lots of automated PRs - push: - branches: + # push: + # branches: # - main - - pin_conda-lock schedule: - cron: '0 4 */10 * *' @@ -37,6 +36,7 @@ jobs: conda --version # setup-miniconda@v3 installs an old conda and mamba # forcing a modern mamba updates both mamba and conda + # pin <2 due to https://github.com/ESMValGroup/ESMValTool/pull/3771 conda install -c conda-forge "mamba>=1.4.8,<2" conda config --show-sources conda config --show