From 3e6e278d5cdc37d5b051028610c0a88cc2dd7feb Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Thu, 7 Sep 2023 13:10:57 +0100
Subject: [PATCH] actions4

---
 .github/workflows/tomobar_conda_upload.yml | 18 +++++++++++-------
 .scripts/conda_upload.sh                   |  3 +++
 conda-recipe/environment/environment.yml   |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tomobar_conda_upload.yml b/.github/workflows/tomobar_conda_upload.yml
index e246aaf7..aede40ab 100644
--- a/.github/workflows/tomobar_conda_upload.yml
+++ b/.github/workflows/tomobar_conda_upload.yml
@@ -11,18 +11,22 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.10'
+      - name: Checkout repository code
+        uses: actions/checkout@v3
+        with:
+          ref: "main"
+          fetch-depth: 0
+
+      # setup Python 3.9
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
 
     - name: Install dependencies with Conda
       run: |
         $CONDA/bin/conda env update --file conda-recipe/environment/environment.yml --name base
-        $CONDA/bin/conda install -n base conda-libmamba-solver
         $CONDA/bin/conda list
-        
 
     - name: Decrypt a secret
       run: ./.scripts/decrypt_secret.sh
diff --git a/.scripts/conda_upload.sh b/.scripts/conda_upload.sh
index 4d23511b..4938f5a7 100755
--- a/.scripts/conda_upload.sh
+++ b/.scripts/conda_upload.sh
@@ -12,6 +12,9 @@ export CONDA_BLD_PATH=~/conda-bld
 export VERSION=$(date +%Y.%m)
 conda build .
 
+$CONDA/bin/conda install conda-build
+$CONDA/bin/conda install -c anaconda anaconda-client
+
 # upload packages to conda
 find $CONDA_BLD_PATH/$OS -name *.tar.bz2 | while read file
 do
diff --git a/conda-recipe/environment/environment.yml b/conda-recipe/environment/environment.yml
index ec4ef0a3..4b69ae82 100644
--- a/conda-recipe/environment/environment.yml
+++ b/conda-recipe/environment/environment.yml
@@ -12,6 +12,6 @@ dependencies:
   - conda-forge::pyproject-flake8
   - conda-forge::pydocstyle
   - conda-forge::setuptools
-  - anaconda::ipython  
+  - anaconda::ipython
   - anaconda::conda-build
   - anaconda::anaconda-client