Merge branch 'release/25.1.4'

.circleci/config.yml

@@ -144,9 +144,8 @@ jobs:
           command: |
             echo "${VORTEX_CI_DB_CACHE_BRANCH}" | tee /tmp/db_cache_branch
             echo "${VORTEX_CI_DB_CACHE_FALLBACK/no/${CIRCLE_BUILD_NUM}}" | tee /tmp/db_cache_fallback
-            echo "$(date ${VORTEX_CI_DB_CACHE_TIMESTAMP})" | tee /tmp/db_cache_timestamp
+            date "${VORTEX_CI_DB_CACHE_TIMESTAMP}" | tee /tmp/db_cache_timestamp
             echo "yes" | tee /tmp/db_cache_fallback_yes
-            echo 'v24.11.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}'
 
       - restore_cache:
           keys:
@@ -176,7 +175,7 @@ jobs:
           command: |
             [ ! -f /tmp/download-db-success ] && echo "==> Database download semaphore file is missing. DB export will not proceed." && exit 0
             ./scripts/vortex/login-container-registry.sh
-            docker compose up -d && sleep 15
+            docker compose up --detach && sleep 15
             docker compose exec cli mkdir -p .data && docker compose cp -L .data/db.sql cli:/app/.data/db.sql || true
             docker compose exec $(env | cut -f1 -d= | sed 's/^/-e /') -T cli bash -c "VORTEX_PROVISION_POST_OPERATIONS_SKIP=1 ./scripts/vortex/provision.sh"
             grep -q ^VORTEX_DB_IMAGE .env && rm .data/db.sql || true

.github/workflows/build-test-deploy.yml

@@ -84,12 +84,18 @@ jobs:
       - name: Process the codebase to run in CI
         run: find . -name "docker-compose.yml" -print0 | xargs -0 -I {} sh -c "sed -i -e '/###/d' {} && sed -i -e 's/##//' {}"
 
+      - name: Adjust variables for a scheduled run
+        if: github.event_name == 'schedule'
+        run: |
+          echo "VORTEX_CI_DB_CACHE_FALLBACK=no" >> "$GITHUB_ENV"
+
       - name: Create cache keys files for database caching
         run: |
           echo "${VORTEX_CI_DB_CACHE_BRANCH}" | tee db_cache_branch
           echo "${VORTEX_CI_DB_CACHE_FALLBACK/no/"${GITHUB_RUN_NUMBER}"}" | tee db_cache_fallback
-          echo "yes" | tee db_cache_fallback_yes
           date "${VORTEX_CI_DB_CACHE_TIMESTAMP}" | tee db_cache_timestamp
+          echo "yes" | tee db_cache_fallback_yes
+          echo v24.11.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback') }}-${{ hashFiles('db_cache_timestamp') }}
 
       # Restore DB cache based on the cache strategy set by the cache keys below.
       # Change 'v1' to 'v2', 'v3' etc., commit and push to force cache reset.
@@ -115,8 +121,7 @@ jobs:
         run: |
           if [ ! -f /tmp/download-db-success ]; then echo "==> Database download semaphore file is missing. DB export will not proceed."; exit 0; fi
           ./scripts/vortex/login-container-registry.sh
-          docker compose up --detach
-          sleep 15
+          docker compose up --detach && sleep 15
           docker compose exec cli mkdir -p .data && docker compose cp -L .data/db.sql cli:/app/.data/db.sql
           docker compose exec cli bash -c "VORTEX_PROVISION_POST_OPERATIONS_SKIP=1 ./scripts/vortex/provision.sh"
           ./scripts/vortex/export-db.sh db.sql
@@ -223,6 +228,7 @@ jobs:
         run: |
           mkdir -p "/tmp/workspace/code"
           docker compose cp -L cli:"/app/." "/tmp/workspace/code"
+          du -sh "/tmp/workspace/code"
 
       - name: Upload exported codebase as artifact
         uses: actions/upload-artifact@v4
@@ -332,11 +338,10 @@ jobs:
 
   #;< DEPLOYMENT
   deploy:
-
     runs-on: ubuntu-latest
     needs: build
     #;< !PROVISION_USE_PROFILE
-    if: github.event_name != 'schedule'
+    if: ${{ github.event_name != 'schedule' && !startsWith(github.ref, 'refs/heads/deps/') }}
     #;> !PROVISION_USE_PROFILE
 
     container:

README.md

@@ -10,9 +10,10 @@
 
 <div align="center">
 
+[![Database, Build, Test and Deploy](https://github.com/drevops/vortex/actions/workflows/build-test-deploy.yml/badge.svg)](https://github.com/drevops/vortex/actions/workflows/build-test-deploy.yml)
+[![CircleCI](https://circleci.com/gh/drevops/vortex.svg?style=shield)](https://circleci.com/gh/drevops/vortex)
 [![Test](https://github.com/drevops/vortex/actions/workflows/vortex-test-common.yml/badge.svg)](https://github.com/drevops/vortex/actions/workflows/vortex-test-common.yml)
 [![Test docs](https://github.com/drevops/vortex/actions/workflows/vortex-test-docs.yml/badge.svg)](https://github.com/drevops/vortex/actions/workflows/vortex-test-docs.yml)
-[![CircleCI](https://circleci.com/gh/drevops/vortex.svg?style=shield)](https://circleci.com/gh/drevops/vortex)
 [![codecov](https://codecov.io/gh/drevops/vortex/graph/badge.svg?token=YDTAEWWT5H)](https://codecov.io/gh/drevops/vortex)
 ![GitHub release](https://img.shields.io/github/v/release/drevops/vortex?logo=github)
 ![LICENSE](https://img.shields.io/github/license/drevops/vortex)