correcting ci's - 2

dkazanc · Aug 12, 2024 · 5882ae3 · 5882ae3
1 parent 36505a8
commit 5882ae3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/libtomophantom_conda_upload.yml b/.github/workflows/libtomophantom_conda_upload.yml
@@ -14,11 +14,11 @@ jobs:
       - name: Checkout repository code
         uses: actions/checkout@v4
 
-      # setup Python 3.11
-      - name: Setup Python 3.11
-        uses: actions/setup-python@v2
+      # setup Python 3.10
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: '3.10'
 
       - name: Install dependencies with Conda
         run: |

diff --git a/.github/workflows/tomophantom_conda_upload.yml b/.github/workflows/tomophantom_conda_upload.yml
@@ -14,11 +14,11 @@ jobs:
       - name: Checkout repository code
         uses: actions/checkout@v4
 
-      # setup Python 3.11
-      - name: Setup Python 3.11
-        uses: actions/setup-python@v2
+      # setup Python 3.10
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: '3.10'
 
       - name: Install dependencies with Conda
         run: |

diff --git a/.scripts/conda_upload.sh b/.scripts/conda_upload.sh
@@ -13,7 +13,7 @@ export CIL_VERSION=3.0.1
 $CONDA/bin/conda build conda-recipe . -c httomo
 
 # upload packages to conda
-find $CONDA_BLD_PATH/$OS -name *.tar.bz2 | while read file
+find $CONDA_BLD_PATH/$OS -name '*.tar.bz2' | while read -r file
 do
     echo $file
     $CONDA/bin/anaconda -v --show-traceback --token $CONDA_TOKEN upload $file --force

diff --git a/.scripts/conda_upload_lib.sh b/.scripts/conda_upload_lib.sh
@@ -2,7 +2,7 @@
 
 PKG_NAME=libtomophantom
 USER=httomo-team
-OS=noarch
+OS=linux-64
 CONDA_TOKEN=$(cat $HOME/.secrets/my_secret.json)
 
 mkdir ~/conda-bld
@@ -13,7 +13,7 @@ export CIL_VERSION=3.0.1
 $CONDA/bin/conda build conda-recipe_library . -c httomo
 
 # upload packages to conda
-find $CONDA_BLD_PATH/$OS -name *.tar.bz2 | while read -r file
+find $CONDA_BLD_PATH/$OS -name '*.tar.bz2' | while read -r file
 do
     echo $file
     $CONDA/bin/anaconda -v --show-traceback --token $CONDA_TOKEN upload $file --force