Skip to content

Commit

Permalink
fix with matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
kingjia90 committed Sep 12, 2023
1 parent f1b4262 commit c4d7ee1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 121 deletions.
2 changes: 1 addition & 1 deletion .github/ci/files/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
db:
image: mysql:latest
image: ${DOCKER_DATABASE}
working_dir: /application
command: [ mysqld, --log_bin_trust_function_creators=1, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb-file-per-table=1 ]
volumes:
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/pimcore-demo-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ on:
jobs:
test-pimcore-demo:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- { php-version: 8.1, database: "mariadb:10.3", dependencies: lowest, pimcore_version: "", experimental: false }
- { php-version: 8.2, database: "mariadb:10.7", dependencies: highest, pimcore_version: "", experimental: false }
- { php-version: 8.2, database: "mysql:latest", dependencies: highest, pimcore_version: "", experimental: false }
- { php-version: 8.2, database: "mariadb:10.7", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true }
steps:
# Check out the repo in a sub-dir to see if it can serve as
# template for `composer create-project`
Expand Down Expand Up @@ -64,6 +71,9 @@ jobs:
docker-compose -f docker-compose.yaml -f .github/ci/files/docker-compose.yaml config
- name: Test pimcore installation
env:
PIMCORE_VERSION: "${{ matrix.pimcore_version }}"
DOCKER_DATABASE: "${{ matrix.database }}"
run: |
# Echo commands and terminate on first error
set -ex
Expand All @@ -75,6 +85,10 @@ jobs:
docker-compose down -v --remove-orphans
docker-compose -f docker-compose.yaml -f .github/ci/files/docker-compose.yaml up -d
if [ ! -z "$PIMCORE_VERSION" ]; then
composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}"
fi
# Install dockerize into the php container. We need it to block until
# database is ready to serve connections.
docker-compose exec -T -- php bash -c '\
Expand Down
120 changes: 0 additions & 120 deletions .github/workflows/pimcore-upgrade-demo.yml

This file was deleted.

0 comments on commit c4d7ee1

Please sign in to comment.