Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:5.7
image: mysql:latest
env:
MYSQL_DATABASE: ${{ env.MYSQL_DATABASE }}
MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }}
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,7 @@ cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
_deps

# npm auth token file (created during CI publish)
.npmrc
4 changes: 2 additions & 2 deletions integration/node/run-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ function cleanup {
}

echo "Launch MySQL container"
MYSQL_CONTAINER_ID=$(docker run --rm -d --platform linux/amd64 -e MYSQL_HOSTNAME=${MYSQL_HOSTNAME} -e MYSQL_DATABASE=${TEST_DB_NAME} -e MYSQL_USERNAME=${TEST_DB_USER} \
MYSQL_CONTAINER_ID=$(docker run --rm -d -e MYSQL_HOSTNAME=${MYSQL_HOSTNAME} -e MYSQL_DATABASE=${TEST_DB_NAME} -e MYSQL_USERNAME=${TEST_DB_USER} \
-e MYSQL_ROOT_PASSWORD=${TEST_DB_PASSWORD} -p 127.0.0.1:${TEST_DB_PORT}:3306/tcp --health-cmd "mysqladmin --protocol=tcp -u root \
-pPassword123 ping" --health-interval 10s --health-timeout 5s --health-retries 10 mysql:5.7)
-pPassword123 ping" --health-interval 10s --health-timeout 5s --health-retries 10 mysql:latest)

# Ensure Docker container is killed
trap cleanup EXIT
Expand Down
3 changes: 1 addition & 2 deletions scripts/local-integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export TEST_DB_PASSWORD=Password123
export TEST_DB_PORT=3306

MYSQL_CONTAINER_ID=$($CONTAINER_CMD run --rm -d \
--platform linux/amd64 \
-e MYSQL_HOSTNAME=${MYSQL_HOSTNAME} \
-e MYSQL_DATABASE=${TEST_DB_NAME} \
-e MYSQL_USERNAME=${TEST_DB_USER} \
Expand All @@ -48,7 +47,7 @@ MYSQL_CONTAINER_ID=$($CONTAINER_CMD run --rm -d \
--health-interval 10s \
--health-timeout 5s \
--health-retries 10 \
mysql:5.7)
mysql:latest)

if [ $? -ne 0 ]; then
echo Docker failed to start container
Expand Down
9 changes: 0 additions & 9 deletions test/helpers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import crypto from 'crypto';

export const posix_log_levels = {
emerg: 0,
alert: 1,
Expand All @@ -11,13 +9,6 @@ export const posix_log_levels = {
debug: 7
};

export function get_sample_json(size: number): string {
return JSON.stringify({
key1: 'value1b',
nested: { secret: crypto.randomBytes(size).toString('base64') }
}, ['nested.secret']);
}

export function get_string(size: number): string {
return 'x'.repeat(size);
}
Expand Down
Loading