Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,11 @@ jobs:
[ ! -f /tmp/fetch-db-fresh ] && echo "==> Database fetch semaphore file is missing. DB export will not proceed." && exit 0
./vendor/bin/vortex-login-container-registry
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 cli mkdir -p .data && docker compose --progress quiet 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 ./vendor/bin/vortex-provision"
grep -q ^VORTEX_DB_IMAGE .env && rm .data/db.sql || true
./vendor/bin/vortex-export-db db.sql
docker compose exec -T cli test -f /app/.data/db.sql && docker compose cp -L cli:/app/.data/db.sql .data/db.sql || true
docker compose exec -T cli test -f /app/.data/db.sql && docker compose --progress quiet cp -L cli:/app/.data/db.sql .data/db.sql || true
no_output_timeout: 30m

# Deploy the freshly-exported database image to the container registry.
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
command: |
echo "${VORTEX_DEPLOY_TYPES:-}" | grep -vq "artifact" && exit 0 || true
mkdir -p "/tmp/workspace/code"
docker compose cp -L cli:"/app/." "/tmp/workspace/code"
docker compose --progress quiet cp -L cli:"/app/." "/tmp/workspace/code"
du -sh "/tmp/workspace/code"

- run:
Expand All @@ -459,13 +459,13 @@ jobs:
# container to avoid holding two copies for the rest of the job.
if [ -f .data/db.sql ]; then
docker compose exec cli mkdir -p .data
docker compose cp -L .data/db.sql cli:/app/.data/db.sql
docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
rm -f .data/db.sql
fi
#;< MIGRATION
if [ -f ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" ]; then
docker compose exec -T cli mkdir -p .data
docker compose cp -L ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" cli:"/app/.data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
docker compose --progress quiet cp -L ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" cli:"/app/.data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
rm -f ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
fi
#;> MIGRATION
Expand Down Expand Up @@ -493,7 +493,7 @@ jobs:
[ "${VORTEX_CI_IS_PHPUNIT_RUNNER:-1}" = "1" ] || exit 0
mkdir -p "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
fi

- run:
Expand Down Expand Up @@ -566,9 +566,9 @@ jobs:
command: |
mkdir -p "${VORTEX_CI_TEST_RESULTS}" "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
if docker compose exec -T cli sh -c '[ -d /app/.logs/test_results/ ]'; then
docker compose cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
docker compose --progress quiet cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
fi
fi
when: always
Expand Down
16 changes: 8 additions & 8 deletions .circleci/vortex-test-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ jobs:
[ ! -f /tmp/fetch-db-fresh ] && echo "==> Database fetch semaphore file is missing. DB export will not proceed." && exit 0
./vendor/bin/vortex-login-container-registry
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 cli mkdir -p .data && docker compose --progress quiet 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 ./vendor/bin/vortex-provision"
grep -q ^VORTEX_DB_IMAGE .env && rm .data/db.sql || true
./vendor/bin/vortex-export-db db.sql
docker compose exec -T cli test -f /app/.data/db.sql && docker compose cp -L cli:/app/.data/db.sql .data/db.sql || true
docker compose exec -T cli test -f /app/.data/db.sql && docker compose --progress quiet cp -L cli:/app/.data/db.sql .data/db.sql || true
no_output_timeout: 30m

# Deploy the freshly-exported database image to the container registry.
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
command: |
echo "${VORTEX_DEPLOY_TYPES:-}" | grep -vq "artifact" && exit 0 || true
mkdir -p "/tmp/workspace/code"
docker compose cp -L cli:"/app/." "/tmp/workspace/code"
docker compose --progress quiet cp -L cli:"/app/." "/tmp/workspace/code"
du -sh "/tmp/workspace/code"

- run:
Expand All @@ -294,13 +294,13 @@ jobs:
# container to avoid holding two copies for the rest of the job.
if [ -f .data/db.sql ]; then
docker compose exec cli mkdir -p .data
docker compose cp -L .data/db.sql cli:/app/.data/db.sql
docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
rm -f .data/db.sql
fi
#;< MIGRATION
if [ -f ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" ]; then
docker compose exec -T cli mkdir -p .data
docker compose cp -L ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" cli:"/app/.data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
docker compose --progress quiet cp -L ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" cli:"/app/.data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
rm -f ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
fi
#;> MIGRATION
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
[ "${VORTEX_CI_IS_PHPUNIT_RUNNER:-1}" = "1" ] || exit 0
mkdir -p "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
fi

- run:
Expand Down Expand Up @@ -401,9 +401,9 @@ jobs:
command: |
mkdir -p "${VORTEX_CI_TEST_RESULTS}" "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
if docker compose exec -T cli sh -c '[ -d /app/.logs/test_results/ ]'; then
docker compose cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
docker compose --progress quiet cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
fi
fi
when: always
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,10 @@ jobs:
if [ ! -f /tmp/fetch-db-fresh ]; then echo "==> Database fetch semaphore file is missing. DB export will not proceed."; exit 0; fi
./vendor/bin/vortex-login-container-registry
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 mkdir -p .data && docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
docker compose exec cli bash -c "VORTEX_PROVISION_POST_OPERATIONS_SKIP=1 ./vendor/bin/vortex-provision"
./vendor/bin/vortex-export-db db.sql
docker compose cp -L cli:/app/.data/db.sql .data/db.sql
docker compose --progress quiet cp -L cli:/app/.data/db.sql .data/db.sql
timeout-minutes: 30

# Save cache per default branch and the timestamp.
Expand Down Expand Up @@ -473,7 +473,7 @@ jobs:
if: ${{ matrix.instance == 0 && !startsWith(github.head_ref || github.ref_name, 'deps/') && contains(env.VORTEX_DEPLOY_TYPES, 'artifact') }}
run: |
mkdir -p "/tmp/workspace/code" "/tmp/artifacts"
docker compose cp -L cli:"/app/." "/tmp/workspace/code"
docker compose --progress quiet cp -L cli:"/app/." "/tmp/workspace/code"
tar -C /tmp/workspace -cpf /tmp/artifacts/code.tar code
du -sh "/tmp/artifacts"

Expand All @@ -492,13 +492,13 @@ jobs:
# container to avoid holding two copies for the rest of the job.
if [ -f .data/db.sql ]; then
docker compose exec cli mkdir -p .data
docker compose cp -L .data/db.sql cli:/app/.data/db.sql
docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
rm -f .data/db.sql
fi
#;< MIGRATION
if [ -f ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" ]; then
docker compose exec -T cli mkdir -p .data
docker compose cp -L ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" cli:"/app/.data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
docker compose --progress quiet cp -L ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}" cli:"/app/.data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
rm -f ".data/${VORTEX_FETCH_DB2_FILE:-db2.sql}"
fi
#;> MIGRATION
Expand All @@ -523,7 +523,7 @@ jobs:
run: |
mkdir -p ".logs"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. ".logs/"
docker compose --progress quiet cp cli:/app/.logs/. ".logs/"
fi

- name: Extract code coverage
Expand Down Expand Up @@ -623,7 +623,7 @@ jobs:
run: |
mkdir -p ".logs"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. ".logs/"
docker compose --progress quiet cp cli:/app/.logs/. ".logs/"
fi

- name: Upload test artifacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ jobs:
if [ ! -f /tmp/fetch-db-fresh ]; then echo "==> Database fetch semaphore file is missing. DB export will not proceed."; exit 0; fi
./vendor/bin/vortex-login-container-registry
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 mkdir -p .data && docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
docker compose exec cli bash -c "VORTEX_PROVISION_POST_OPERATIONS_SKIP=1 ./vendor/bin/vortex-provision"
./vendor/bin/vortex-export-db db.sql
docker compose cp -L cli:/app/.data/db.sql .data/db.sql
docker compose --progress quiet cp -L cli:/app/.data/db.sql .data/db.sql
timeout-minutes: 30

# Save cache per default branch and the timestamp.
Expand Down Expand Up @@ -412,7 +412,7 @@ jobs:
if: ${{ matrix.instance == 0 && !startsWith(github.head_ref || github.ref_name, 'deps/') && contains(env.VORTEX_DEPLOY_TYPES, 'artifact') }}
run: |
mkdir -p "/tmp/workspace/code" "/tmp/artifacts"
docker compose cp -L cli:"/app/." "/tmp/workspace/code"
docker compose --progress quiet cp -L cli:"/app/." "/tmp/workspace/code"
tar -C /tmp/workspace -cpf /tmp/artifacts/code.tar code
du -sh "/tmp/artifacts"

Expand All @@ -429,7 +429,7 @@ jobs:
# container to avoid holding two copies for the rest of the job.
if [ -f .data/db.sql ]; then
docker compose exec cli mkdir -p .data
docker compose cp -L .data/db.sql cli:/app/.data/db.sql
docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
rm -f .data/db.sql
fi
docker compose exec $(env | cut -f1 -d= | sed 's/^/-e /') -T cli ./vendor/bin/vortex-provision
Expand All @@ -450,7 +450,7 @@ jobs:
run: |
mkdir -p ".logs"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. ".logs/"
docker compose --progress quiet cp cli:/app/.logs/. ".logs/"
fi

- name: Extract code coverage
Expand Down Expand Up @@ -530,7 +530,7 @@ jobs:
run: |
mkdir -p ".logs"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. ".logs/"
docker compose --progress quiet cp cli:/app/.logs/. ".logs/"
fi

- name: Upload test artifacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ jobs:
[ ! -f /tmp/fetch-db-fresh ] && echo "==> Database fetch semaphore file is missing. DB export will not proceed." && exit 0
./vendor/bin/vortex-login-container-registry
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 cli mkdir -p .data && docker compose --progress quiet 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 ./vendor/bin/vortex-provision"
grep -q ^VORTEX_DB_IMAGE .env && rm .data/db.sql || true
./vendor/bin/vortex-export-db db.sql
docker compose exec -T cli test -f /app/.data/db.sql && docker compose cp -L cli:/app/.data/db.sql .data/db.sql || true
docker compose exec -T cli test -f /app/.data/db.sql && docker compose --progress quiet cp -L cli:/app/.data/db.sql .data/db.sql || true
no_output_timeout: 30m

# Deploy the freshly-exported database image to the container registry.
Expand Down Expand Up @@ -374,7 +374,7 @@ jobs:
command: |
echo "${VORTEX_DEPLOY_TYPES:-}" | grep -vq "artifact" && exit 0 || true
mkdir -p "/tmp/workspace/code"
docker compose cp -L cli:"/app/." "/tmp/workspace/code"
docker compose --progress quiet cp -L cli:"/app/." "/tmp/workspace/code"
du -sh "/tmp/workspace/code"

- run:
Expand All @@ -392,7 +392,7 @@ jobs:
# container to avoid holding two copies for the rest of the job.
if [ -f .data/db.sql ]; then
docker compose exec cli mkdir -p .data
docker compose cp -L .data/db.sql cli:/app/.data/db.sql
docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
rm -f .data/db.sql
fi
docker compose exec $(env | cut -f1 -d= | sed 's/^/-e /') -T cli ./vendor/bin/vortex-provision
Expand All @@ -416,7 +416,7 @@ jobs:
[ "${VORTEX_CI_IS_PHPUNIT_RUNNER:-1}" = "1" ] || exit 0
mkdir -p "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
fi

- run:
Expand Down Expand Up @@ -472,9 +472,9 @@ jobs:
command: |
mkdir -p "${VORTEX_CI_TEST_RESULTS}" "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
if docker compose exec -T cli sh -c '[ -d /app/.logs/test_results/ ]'; then
docker compose cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
docker compose --progress quiet cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
fi
fi
when: always
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ jobs:
[ ! -f /tmp/fetch-db-fresh ] && echo "==> Database fetch semaphore file is missing. DB export will not proceed." && exit 0
./vendor/bin/vortex-login-container-registry
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 cli mkdir -p .data && docker compose --progress quiet 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 ./vendor/bin/vortex-provision"
grep -q ^VORTEX_DB_IMAGE .env && rm .data/db.sql || true
./vendor/bin/vortex-export-db db.sql
docker compose exec -T cli test -f /app/.data/db.sql && docker compose cp -L cli:/app/.data/db.sql .data/db.sql || true
docker compose exec -T cli test -f /app/.data/db.sql && docker compose --progress quiet cp -L cli:/app/.data/db.sql .data/db.sql || true
no_output_timeout: 30m

# Deploy the freshly-exported database image to the container registry.
Expand Down Expand Up @@ -374,7 +374,7 @@ jobs:
command: |
echo "${VORTEX_DEPLOY_TYPES:-}" | grep -vq "artifact" && exit 0 || true
mkdir -p "/tmp/workspace/code"
docker compose cp -L cli:"/app/." "/tmp/workspace/code"
docker compose --progress quiet cp -L cli:"/app/." "/tmp/workspace/code"
du -sh "/tmp/workspace/code"

- run:
Expand All @@ -392,7 +392,7 @@ jobs:
# container to avoid holding two copies for the rest of the job.
if [ -f .data/db.sql ]; then
docker compose exec cli mkdir -p .data
docker compose cp -L .data/db.sql cli:/app/.data/db.sql
docker compose --progress quiet cp -L .data/db.sql cli:/app/.data/db.sql
rm -f .data/db.sql
fi
docker compose exec $(env | cut -f1 -d= | sed 's/^/-e /') -T cli ./vendor/bin/vortex-provision
Expand All @@ -416,7 +416,7 @@ jobs:
[ "${VORTEX_CI_IS_PHPUNIT_RUNNER:-1}" = "1" ] || exit 0
mkdir -p "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
fi

- run:
Expand Down Expand Up @@ -480,9 +480,9 @@ jobs:
command: |
mkdir -p "${VORTEX_CI_TEST_RESULTS}" "${VORTEX_CI_ARTIFACTS}"
if docker compose ps --services --filter "status=running" | grep -q cli && docker compose exec cli test -d /app/.logs; then
docker compose cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
docker compose --progress quiet cp cli:/app/.logs/. "${VORTEX_CI_ARTIFACTS}/"
if docker compose exec -T cli sh -c '[ -d /app/.logs/test_results/ ]'; then
docker compose cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
docker compose --progress quiet cp cli:/app/.logs/test_results/. "${VORTEX_CI_TEST_RESULTS}/"
fi
fi
when: always
Expand Down
Loading
Loading