Skip to content

Commit f95921f

Browse files
Michael Vasseurvmcj
authored andcommitted
Allow testing against MySQL
1 parent d49d234 commit f95921f

File tree

1 file changed

+10
-45
lines changed

1 file changed

+10
-45
lines changed

.github/workflows/unit-tests.yml

Lines changed: 10 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,25 @@ jobs:
1818
unit-tests:
1919
services:
2020
sqlserver:
21-
image: mariadb
21+
image: ${{ matrix.SQL }}
2222
ports:
2323
- 3306:3306
2424
env:
2525
MYSQL_ROOT_PASSWORD: root
26-
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
26+
options: ${{ matrix.SQL_OPTIONS }}
2727
container:
2828
image: domjudge/gitlabci:24.04
2929
strategy:
3030
matrix:
3131
PHPVERSION: [8.1]
32-
TEST: [UNIT]
32+
TEST: [UNIT,E2E]
33+
CRAWL_SHADOW_MODE: [0]
34+
SQL_OPTIONS: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
35+
include:
36+
- PHPVERSION: 8.4
37+
TEST: UNIT
38+
SQL: mysql
39+
SQL_OPTIONS: --mysql-native-password --authentication_policy=mysql_native_password
3340
runs-on: ubuntu-latest
3441
steps:
3542
- uses: actions/checkout@v4
@@ -54,45 +61,3 @@ jobs:
5461
with:
5562
name: unit-test-output
5663
path: /tmp/artifacts
57-
#.unit_job:
58-
# script:
59-
# - set -eux
60-
# - if [ -z ${PHPVERSION+x} ]; then export PHPVERSION=8.1; fi
61-
# - if [ -z ${TEST+x} ]; then export TEST="UNIT"; fi
62-
# - if [ "$TEST" = "UNIT" ] && [ "$CRAWL_SHADOW_MODE" != "0" ]; then exit 0; fi
63-
# - if [ "$TEST" = "E2E" ] && [ "$CRAWL_SHADOW_MODE" != "0" ] && [ "$CI_COMMIT_BRANCH" != "main" ]; then exit 0; fi
64-
# - export CRAWL_SHADOW_MODE
65-
# - ./gitlab/unit-tests.sh $PHPVERSION $TEST
66-
# artifacts:
67-
# when: always
68-
# paths:
69-
# - unit-tests.xml
70-
# - coverage-html
71-
# - deprecation.txt
72-
# - duration
73-
# - gitlabartifacts
74-
# reports:
75-
# junit:
76-
# - unit-tests.xml
77-
#
78-
#run unit tests:
79-
# only:
80-
# - main
81-
# - /^[0-9].[0-9]$/
82-
# extends: [.mariadb_job,.phpsupported_job,.unit_job]
83-
#
84-
#run unit tests (PR):
85-
# except:
86-
# - main
87-
# - /^[0-9].[0-9]$/
88-
# extends: [.mariadb_job,.phpsupported_job_pr,.unit_job]
89-
#
90-
#run unit tests (MySQL):
91-
# only:
92-
# - main
93-
# - /^[0-9].[0-9]$/
94-
# extends: [.mysql_job,.unit_job]
95-
# parallel:
96-
# matrix:
97-
# - TEST: ["E2E","Unit"]
98-
# CRAWL_SHADOW_MODE: ["0"]

0 commit comments

Comments
 (0)