Merge branch 'dev'

source-data · Feb 20, 2024 · 3b0cf63 · 3b0cf63
2 parents b8bc5e1 + 5f8119d
commit 3b0cf63
Show file tree

Hide file tree

Showing 102 changed files with 5,900 additions and 2,066 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,9 @@ env:
   IMAGE_SOURCE: https://github.com/source-data/sd-graph
   IMAGE_REVISION: ${{ github.sha }}
   IMAGE_TAG: ${{ github.ref_name }}
+  # prevent timeouts when pushing the images
+  DOCKER_CLIENT_TIMEOUT: 180
+  COMPOSE_HTTP_TIMEOUT: 180
 
 jobs:
   lint:
@@ -52,6 +55,8 @@ jobs:
     - run: scripts/run-tests.sh -vv
 
   build-and-push-image:
+    # only build and push images on pushes to master and dev
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
     strategy:
       matrix:
         image: ['flask_deploy', 'flask', 'traefik', 'vuejs']