Skip to content

Commit 0494322

Browse files
authored
Merge pull request #1822 from sidorares/non-docker-workflow
ci: only start mysql docker if matrix.mysql-version is defined
2 parents 24126ab + 577ed8d commit 0494322

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/ci-linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- uses: actions/checkout@v3
7171

7272
- name: Set up MySQL
73-
if: ${{ !startsWith(env.MYSQL_CONNECTION_URL, 'mysql://') }}
73+
if: ${{ matrix.mysql-version }}
7474
run: docker run -d -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_DATABASE=${{ env.MYSQL_DATABASE }} -v $PWD/mysqldata:/var/lib/mysql/ -v $PWD/examples/custom-conf:/etc/mysql/conf.d -v $PWD/examples/ssl/certs:/certs -p ${{ env.MYSQL_PORT }}:3306 ${{ matrix.mysql-version }}
7575

7676
- name: Set up Node.js ${{ matrix.node-version }}
@@ -89,13 +89,13 @@ jobs:
8989
run: npm ci
9090

9191
- name: Wait mysql server is ready
92-
if: ${{ !startsWith(env.MYSQL_CONNECTION_URL, 'mysql://') }}
92+
if: ${{ matrix.mysql-version }}
9393
run: node tools/wait-up.js
9494

9595
- name: Run tests
9696
run: FILTER=${{matrix.filter}} MYSQL_USE_TLS=${{ matrix.use-tls }} MYSQL_USE_COMPRESSION=${{ matrix.use-compression }} npm run coverage-test
9797

98-
- run: echo "coverage-artifact-name=`echo -n "${{github.run_id}}-${{ matrix.node-version }}-${{ matrix.mysql-version }}-${{matrix.use-tls}}-${{matrix.use-compression}}" | shasum | cut -d " " -f 1`" >> $GITHUB_ENV
98+
- run: echo "coverage-artifact-name=`echo -n "${{github.run_id}}-${{ matrix.node-version }}-${{ matrix.mysql-version }}-{${{ matrix.mysql_connection_url_key }}-${{matrix.use-tls}}-${{matrix.use-compression}}" | shasum | cut -d " " -f 1`" >> $GITHUB_ENV
9999
- uses: actions/upload-artifact@v3
100100
with:
101101
name: coverage-${{env.coverage-artifact-name}}

0 commit comments

Comments
 (0)