fix missing modules and add release on tag

lambgeo · Apr 13, 2020 · e7c1e10 · e7c1e10
1 parent 01ec497
commit e7c1e10
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ common: &common
             docker stop lambda
             docker rm lambda
 
-            if [[ "$CIRCLE_BRANCH" == "master" ]]; then
+            if [[ -z "${CIRCLE_TAG}" ]]; then
               docker tag geolayer lambgeo/lambda:gdal${GDAL_VERSION}-py${PYTHON_VERSION}-geolayer
               docker push lambgeo/lambda:gdal${GDAL_VERSION}-py${PYTHON_VERSION}-geolayer
             fi
@@ -84,14 +84,24 @@ workflows:
   build_and_deploy:
     jobs:
       - "gdal-3.1"
-      - "gdal-3.0"
-      - "gdal-2.4"    
+          filters:  # required since `deploy` has tag filters AND requires `build`
+            tags:
+              only: /.*/
+      - "gdal-3.0":
+          filters:  # required since `deploy` has tag filters AND requires `build`
+            tags:
+              only: /.*/
+      - "gdal-2.4":
+          filters:  # required since `deploy` has tag filters AND requires `build`
+            tags:
+              only: /.*/
       - deploy:
           requires:
             - "gdal-3.1"
             - "gdal-3.0"
             - "gdal-2.4"
           filters:
+            tags:
+              only: /^[0-9]+.*/
             branches:
-              only:
-                - master
+              ignore: /.*/
diff --git a/requirements-gdal2.4.txt b/requirements-gdal2.4.txt
@@ -6,3 +6,7 @@ rasterio>=1.1.3
 
 mercantile
 supermercado
+
+# HACK, those package are in the docker image but not in the lambda env
+requests
+pyyaml
diff --git a/requirements-gdal3.0.txt b/requirements-gdal3.0.txt
@@ -7,3 +7,7 @@ pyproj==2.4.1
 
 mercantile
 supermercado
+
+# HACK, those package are in the docker image but not in the lambda env
+requests
+pyyaml
diff --git a/requirements-gdal3.1.txt b/requirements-gdal3.1.txt
@@ -7,3 +7,7 @@ pyproj==2.4.1
 
 mercantile
 supermercado
+
+# HACK, those package are in the docker image but not in the lambda env
+requests
+pyyaml