From a6e34eafc58a7b3167fb3d1f9fa21ec465f7e1fc Mon Sep 17 00:00:00 2001 From: Jay Gowdy Date: Wed, 4 Mar 2026 11:08:35 -0800 Subject: [PATCH 1/2] Use mysql:latest instead of EOL mysql:5.7 in CI and local scripts MySQL 5.7 reached end of life in October 2023. Switch all references to mysql:latest so we automatically pick up new releases. Also drop --platform linux/amd64 from local scripts since mysql:latest provides native ARM images. --- .github/workflows/test.yml | 2 +- integration/node/run-local.sh | 4 ++-- scripts/local-integration-test.sh | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d2d0d6..8f7a048 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 }} diff --git a/integration/node/run-local.sh b/integration/node/run-local.sh index 9d50fb4..83b35f5 100755 --- a/integration/node/run-local.sh +++ b/integration/node/run-local.sh @@ -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 diff --git a/scripts/local-integration-test.sh b/scripts/local-integration-test.sh index 79cdc87..216a77f 100755 --- a/scripts/local-integration-test.sh +++ b/scripts/local-integration-test.sh @@ -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} \ @@ -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 From 85f1fedbf597d0285919a545e26c2f26e4addd18 Mon Sep 17 00:00:00 2001 From: Jay Gowdy Date: Wed, 4 Mar 2026 11:10:51 -0800 Subject: [PATCH 2/2] Remove unused get_sample_json helper and add .npmrc to .gitignore get_sample_json was never called and had a broken JSON.stringify replacer. Also gitignore .npmrc to prevent accidental commit of the temporary auth token file created during CI publish. --- .gitignore | 5 ++++- test/helpers.ts | 9 --------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c522db7..d5d0a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -139,4 +139,7 @@ cmake_install.cmake install_manifest.txt compile_commands.json CTestTestfile.cmake -_deps \ No newline at end of file +_deps + +# npm auth token file (created during CI publish) +.npmrc \ No newline at end of file diff --git a/test/helpers.ts b/test/helpers.ts index c4f6792..10c0e57 100644 --- a/test/helpers.ts +++ b/test/helpers.ts @@ -1,5 +1,3 @@ -import crypto from 'crypto'; - export const posix_log_levels = { emerg: 0, alert: 1, @@ -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); }