Skip to content

Commit 0366b77

Browse files
authored
refactor: start only required services (#10115)
1 parent 3573f5d commit 0366b77

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/reusable-phpunit-test.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
# Service containers cannot be extracted to caller workflows yet
7474
services:
7575
mysql:
76-
image: mysql:${{ inputs.mysql-version || '8.0' }}
76+
image: ${{ inputs.db-platform == 'MySQLi' && format('mysql:{0}', inputs.mysql-version || '8.0') || '' }}
7777
env:
7878
MYSQL_ALLOW_EMPTY_PASSWORD: yes
7979
MYSQL_DATABASE: test
@@ -86,7 +86,7 @@ jobs:
8686
--health-retries=3
8787
8888
postgres:
89-
image: postgres
89+
image: ${{ inputs.db-platform == 'Postgre' && 'postgres' || '' }}
9090
env:
9191
POSTGRES_USER: postgres
9292
POSTGRES_PASSWORD: postgres
@@ -100,7 +100,7 @@ jobs:
100100
--health-retries=3
101101
102102
mssql:
103-
image: mcr.microsoft.com/mssql/server:2025-CU2-ubuntu-24.04
103+
image: ${{ inputs.db-platform == 'SQLSRV' && 'mcr.microsoft.com/mssql/server:2025-CU3-ubuntu-24.04' || '' }}
104104
env:
105105
MSSQL_SA_PASSWORD: 1Secure*Password1
106106
ACCEPT_EULA: Y
@@ -114,7 +114,7 @@ jobs:
114114
--health-retries=3
115115
116116
oracle:
117-
image: gvenzl/oracle-free:latest
117+
image: ${{ inputs.db-platform == 'OCI8' && 'gvenzl/oracle-free:latest' || '' }}
118118
env:
119119
ORACLE_RANDOM_PASSWORD: true
120120
APP_USER: ORACLE
@@ -146,10 +146,9 @@ jobs:
146146
- name: Install mssql-tools on runner
147147
if: ${{ inputs.db-platform == 'SQLSRV' }}
148148
run: |
149-
# Detect Ubuntu version used by the runner (fallback to 24.04)
150-
DISTRO=$(lsb_release -rs 2>/dev/null || echo '24.04')
151-
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
152-
curl -sSL https://packages.microsoft.com/config/ubuntu/${DISTRO}/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
149+
source /etc/os-release
150+
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor --batch --yes -o /usr/share/keyrings/microsoft-prod.gpg
151+
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/ubuntu/${VERSION_ID}/prod ${UBUNTU_CODENAME} main" | sudo tee /etc/apt/sources.list.d/mssql-release.list
153152
sudo apt-get update
154153
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 mssql-tools18 unixodbc-dev
155154

.github/workflows/test-random-execution.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
services:
8181
mysql:
82-
image: mysql:8.0
82+
image: ${{ matrix.db-platform == 'MySQLi' && 'mysql:8.0' || '' }}
8383
env:
8484
MYSQL_ALLOW_EMPTY_PASSWORD: yes
8585
MYSQL_DATABASE: test
@@ -92,7 +92,7 @@ jobs:
9292
--health-retries=3
9393
9494
postgres:
95-
image: postgres
95+
image: ${{ matrix.db-platform == 'Postgre' && 'postgres' || '' }}
9696
env:
9797
POSTGRES_USER: postgres
9898
POSTGRES_PASSWORD: postgres
@@ -106,7 +106,7 @@ jobs:
106106
--health-retries=3
107107
108108
mssql:
109-
image: mcr.microsoft.com/mssql/server:2025-CU2-ubuntu-24.04
109+
image: ${{ matrix.db-platform == 'SQLSRV' && 'mcr.microsoft.com/mssql/server:2025-CU3-ubuntu-24.04' || '' }}
110110
env:
111111
MSSQL_SA_PASSWORD: 1Secure*Password1
112112
ACCEPT_EULA: Y
@@ -120,7 +120,7 @@ jobs:
120120
--health-retries=3
121121
122122
oracle:
123-
image: gvenzl/oracle-free:latest
123+
image: ${{ matrix.db-platform == 'Oracle' && 'gvenzl/oracle-free:latest' || '' }}
124124
env:
125125
ORACLE_RANDOM_PASSWORD: true
126126
APP_USER: ORACLE

0 commit comments

Comments
 (0)