Merge branch 'v3.2' of https://github.com/Loop3D/map2loop into v3.2

Loop3D · Dec 16, 2024 · 0ec506d · 0ec506d
2 parents 97cf7d3 + 275ed33
commit 0ec506d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/linting_and_testing.yml b/.github/workflows/linting_and_testing.yml
@@ -34,8 +34,9 @@ jobs:
         run: |
             conda update -n base -c defaults conda -y 
             conda install -n base conda-libmamba-solver -c conda-forge -y
+            conda install -c conda-forge gdal -y
             conda install -c conda-forge -c loop3d --file dependencies.txt -y
-            conda install gdal=3.8.4 pytest -y
+            conda install pytest -y
 
       - name: Install map2loop
         run: |

diff --git a/.github/workflows/publish_conda.yml b/.github/workflows/publish_conda.yml
@@ -1,11 +1,10 @@
 on:
-    push:
-      branches:
-        - master
-    workflow_dispatch:
-
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+    
 jobs:
-
   release-please:
     runs-on: ubuntu-24.04
     steps: