diff --git a/.github/actions/mysql-client-tests/action.yaml b/.github/actions/mysql-client-tests/action.yaml index a28f3a2d7a..4d89a8ceda 100644 --- a/.github/actions/mysql-client-tests/action.yaml +++ b/.github/actions/mysql-client-tests/action.yaml @@ -1,8 +1,5 @@ name: 'Dolt MySQL client integration tests' description: 'Smoke tests for mysql client integrations' -outputs: - results: # logged test results output - description: 'The results of the tests' runs: using: 'docker' image: '../../../MySQLDockerfile' diff --git a/.github/workflows/ci-mysql-client-tests.yaml b/.github/workflows/ci-mysql-client-tests.yaml index 7b6711abab..adfe2ed423 100644 --- a/.github/workflows/ci-mysql-client-tests.yaml +++ b/.github/workflows/ci-mysql-client-tests.yaml @@ -1,4 +1,6 @@ -on: [push] +name: Test MySQL Client integrations + +on: [pull_request] jobs: mysql_client_integrations_job: @@ -8,4 +10,4 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Test mysql client integrations - uses: ./.github/actions/mysql-client-tests # Uses an action in the root directory + uses: ./.github/actions/mysql-client-tests diff --git a/ACTIONS-README.md b/ACTIONS-README.md deleted file mode 100644 index 7d858ba86b..0000000000 --- a/ACTIONS-README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Dolt MySQL client integration docker action - -This action runs ./mysql-client-tests in docker. - -## Outputs - -### `results` - -The results of the tests. - -## Example usage - -uses: actions/mysql-client-test-action@v1 diff --git a/MySQLDockerfile b/MySQLDockerfile index 68f6c78246..77abce6cf4 100644 --- a/MySQLDockerfile +++ b/MySQLDockerfile @@ -60,19 +60,9 @@ RUN apt -y install nodejs RUN apt-get -y update RUN apt-get -y install bats -RUN dolt version - -# setup dolt config -#RUN dolt config --global --add metrics.disabled true -#RUN dolt config --global --add metrics.host localhost -#RUN dolt config --global --add user.name mysql-test-runner -#RUN dolt config --global --add user.email mysql-test-runner@liquidata.co - # install node deps WORKDIR /mysql-client-tests/node RUN npm install -# run tests WORKDIR /mysql-client-tests -#CMD ["bats", "mysql-client-tests.bats"] ENTRYPOINT ["/mysql-client-tests/entrypoint.sh"] diff --git a/mysql-client-tests-entrypoint.sh b/mysql-client-tests-entrypoint.sh index d0dc93ce4e..ecaed346ba 100755 --- a/mysql-client-tests-entrypoint.sh +++ b/mysql-client-tests-entrypoint.sh @@ -1,8 +1,10 @@ #!/bin/sh +echo "updating dolt config for tests:" dolt config --global --add metrics.disabled true dolt config --global --add metrics.host localhost dolt config --global --add user.name mysql-test-runner dolt config --global --add user.email mysql-test-runner@liquidata.co +echo "Running mysql-client-tests:" bats /mysql-client-tests/mysql-client-tests.bats